diff options
| author | Elan Ruusamäe | 2021-03-10 22:49:52 (GMT) |
|---|---|---|
| committer | Elan Ruusamäe | 2021-03-10 23:10:58 (GMT) |
| commit | 20a616bf5c1d2aefd468096219a46dee82f59317 (patch) | |
| tree | 15f39e06ad9a588b2565e35cbceb639b72cfdc1d | |
| parent | ebceaeef21dc503a366cf958048968fdf1e47ba3 (diff) | |
| download | cleanbuild-20a616bf5c1d2aefd468096219a46dee82f59317.zip cleanbuild-20a616bf5c1d2aefd468096219a46dee82f59317.tar.gz | |
Use common die()
| -rwxr-xr-x | bin/cleanbuild-docker.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/cleanbuild-docker.sh b/bin/cleanbuild-docker.sh index d0f9747..fffd8f9 100755 --- a/bin/cleanbuild-docker.sh +++ b/bin/cleanbuild-docker.sh @@ -18,8 +18,9 @@ topdir=$dir/rpm home=/home/builder die() { - echo >&2 "$0: $*" - exit 1 + local rc=${2:-1} + echo >&2 "$0: $1" + exit $rc } is_no() { @@ -106,8 +107,7 @@ package_build() { findbr=$PACKAGE_NAME.findbr.log builddir=$(docker exec $name sh -c 'test ! -d rpm/BUILD/* || echo rpm/BUILD/*') if [ -z "$builddir" ]; then - echo >&2 "No build dir. Build failed?" - exit 6 + die "No build dir. Build failed?" 6 fi # need root to run poldek docker exec --user=root -w / $name sh -c "cd $home && cleanbuild/bin/findbr $builddir $buildlog" > $findbr |