From 0dc2550af36fa0b14dae7317e63707408021d1f9 Mon Sep 17 00:00:00 2001
From: Sébastien Luttringer <seblu@seblu.net>
Date: Sat, 2 Mar 2013 05:21:12 +0100
Subject: makechrootpkg: use var instead of file in $copydir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sébastien Luttringer <seblu@seblu.net>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 makechrootpkg.in | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index c8b5f87..08c76a8 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
@@ -155,7 +156,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"
@@ -272,9 +272,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
@@ -308,7 +306,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
@@ -316,7 +314,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
-- 
cgit v1.2.3-54-g00ecf