bootstrap.sh

@@ -1,13 +1,7 @@
 #!/bin/sh
+set -e
 
 test -n "${EXTRA_PKGS}" && apk add --no-cache ${EXTRA_PKGS}
 test -n "${EXTRA_GEMS}" && gem install --no-user-install --no-document ${EXTRA_GEMS}
 
 su-exec builder /usr/local/bin/gem-compiler
-
-exit_status=$?
-
-test -n "${EXTRA_PKGS}" && apk del ${EXTRA_PKGS}
-test -n "${EXTRA_GEMS}" && gem uninstall ${EXTRA_GEMS}
-
-exit ${exit_status}

bulk-compiler.sh

@@ -21,8 +21,6 @@ find build/ -type f |
 
     source "${BUILD}"
 
-    set +e
-
     HTTP_BASIC_USER="${HTTP_BASIC_USER}" \
     HTTP_BASIC_PASSWORD="${HTTP_BASIC_PASSWORD}" \
     SUTTY="${SUTTY}" \
@@ -32,14 +30,12 @@ find build/ -type f |
     EXTRA_PKGS="${EXTRA_PKGS}" \
     EXTRA_GEMS="${EXTRA_GEMS}" \
     GEM_COMPILER_FLAGS="${GEM_COMPILER_FLAGS}" \
-    /usr/local/bin/bootstrap
+    /usr/local/bin/bootstrap || true
 
     if test $? -ne 0 ; then
       BUILT="${FAILED}"
     fi
 
-    set -e
-
     dirname "${BUILT}" | xargs mkdir -p
     touch "${BUILT}"
   done