[arch-projects] [DEVTOOLS][PATCH 5/6] makechrootpkg: use var instead of file in $copydir
Sébastien Luttringer
seblu at seblu.net
Fri Mar 1 23:21:12 EST 2013
Signed-off-by: Sébastien Luttringer <seblu at seblu.net>
---
makechrootpkg.in | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 7a780df..0e2d5c0 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -22,6 +22,7 @@ run_namcap=false
chrootdir=
passeddir=
declare -a install_pkgs
+declare -i ret=0
default_copy=$USER
[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
@@ -160,7 +161,6 @@ if [[ ! -d $copydir ]] || $clean_first; then
fi
if [[ -n "${install_pkgs[*]}" ]]; then
- declare -i ret=0
for install_pkg in "${install_pkgs[@]}"; do
pkgname="${install_pkg##*/}"
cp "$install_pkg" "$copydir/$pkgname"
@@ -277,9 +277,7 @@ cat >"$copydir/chrootbuild" <<EOF
export HOME=/build
cd /build
-sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED
-
-[[ -f BUILD_FAILED ]] && exit 1
+sudo -u nobody makepkg $makepkg_args || exit 1
if $run_namcap; then
pacman -S --needed --noconfirm namcap
@@ -313,7 +311,7 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
done
else
# Just in case. We returned 1, make sure we fail
- touch "$copydir/build/BUILD_FAILED"
+ ret=1
fi
for f in "$copydir"/srcdest/*; do
@@ -321,7 +319,6 @@ for f in "$copydir"/srcdest/*; do
mv "$f" "$SRCDEST"
done
-if [[ -e $copydir/build/BUILD_FAILED ]]; then
- rm "$copydir/build/BUILD_FAILED"
+if (( ret != 0 )); then
die "Build failed, check $copydir/build"
fi
--
Sébastien "Seblu" Luttringer
More information about the arch-projects
mailing list