From 0fec8f64931b62789be7e266ade52a8e200ea9dd Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Fri, 14 Dec 2018 18:57:12 -0500 Subject: [PATCH] Don't use errexit, explicitly exit on failures --- build-deb.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build-deb.sh b/build-deb.sh index c61d1e7ad7..8d701910d6 100755 --- a/build-deb.sh +++ b/build-deb.sh @@ -14,10 +14,9 @@ cleanup() { docker image rm $image_name --force test -d "$package_temporary_dir" && rm -r "$package_temporary_dir" } -trap cleanup EXIT -trap cleanup INT +trap cleanup EXIT INT -docker build . -t "$image_name" -f ./Dockerfile.debian_package -docker run --rm -v "$package_temporary_dir:/temp" "$image_name" cp -r /dist /temp/ -sudo chown -R "$current_user" "$package_temporary_dir" -mv "$package_temporary_dir"/dist/*.deb ../ +docker build . -t "$image_name" -f ./Dockerfile.debian_package || exit 1 +docker run --rm -v "$package_temporary_dir:/temp" "$image_name" cp -r /dist /temp/ || exit 1 +sudo chown -R "$current_user" "$package_temporary_dir" || exit 1 +mv "$package_temporary_dir"/dist/*.deb ../ || exit 1