summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index f931a65a..e9bd57cf 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -718,8 +718,10 @@ run_build() {
build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]}
else
- build 2>&1 || ret=$?
+ # piping to cat ensures makepkg fails on any build error
+ build 2>&1 | cat -; ret=${PIPESTATUS[0]}
fi
+
# reset our shell options
eval "$shellopts"
@@ -772,12 +774,12 @@ run_package() {
exec 3>&1
tee "$BUILDLOG" < "$logpipe" &
exec 1>"$logpipe" 2>"$logpipe"
- $pkgfunc 2>&1 || ret=$?
+ $pkgfunc 2>&1 | cat -; ret=${PIPESTATUS[0]}
sync
exec 1>&3 2>&3 3>&-
rm "$logpipe"
else
- $pkgfunc 2>&1 || ret=$?
+ $pkgfunc 2>&1 | cat -; ret=${PIPESTATUS[0]}
fi
if [ $ret -gt 0 ]; then