From ca2155bb38958cb666d730ddccab2f6a16dbe20b Mon Sep 17 00:00:00 2001 From: Daniel Finimundi Date: Fri, 4 Feb 2022 00:57:45 +0000 Subject: [PATCH] Debootstrap log doen't exist if build completes Signed-off-by: Daniel Finimundi --- build-docker.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index 612c765a4b..961e1d0c8a 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -102,7 +102,7 @@ if [ "${CONTAINER_EXISTS}" != "" ]; then (mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc || true) && cd /pi-gen; (./build.sh ${BUILD_OPTS} || true); rsync -av work/*/build.log deploy/; - rsync -av work/wlanpi/stage0/debootstrap.log deploy/" & + rsync -av work/wlanpi/stage0/debootstrap.log deploy/ || true" & wait "$!" else trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}' SIGINT SIGTERM @@ -119,7 +119,7 @@ else (mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc || true) && cd /pi-gen; (./build.sh ${BUILD_OPTS} || true); rsync -av work/*/build.log deploy/; - rsync -av work/wlanpi/stage0/debootstrap.log deploy/" & + rsync -av work/wlanpi/stage0/debootstrap.log deploy/ || true" & wait "$!" fi @@ -136,4 +136,5 @@ if [ -f deploy/*.zip ]; then echo "Done! Your image(s) should be in deploy/" else echo "Build failed. Logs are in deploy/" + exit 1 fi