From 38fe1b9c637201654fdc8ce77c7baaf0bdb9c639 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sun, 14 Apr 2019 09:53:03 +0200
Subject: setting setarch architecture with new variable (for pentium4)

---
 arch-nspawn.in | 11 ++++-------
 archbuild.in   | 10 ++++------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/arch-nspawn.in b/arch-nspawn.in
index f017a66..9a3ae87 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -117,14 +117,11 @@ copy_hostconf
 
 eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
 
-[[ -z $nosetarch ]] || unset CARCH
-if [[ "${CARCH}" = 'pentium4' ]]; then
-	set_arch='i686'
-else
-	set_arch="${CARCH}"
-fi
+SETARCH="$CARCH"
+[[ -z $nosetarch ]] || unset SETARCH
+[[ "$SETARCH" = "pentium4" ]] && SETARCH="i686"
 
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
+exec ${SETARCH:+setarch "$SETARCH"} systemd-nspawn -q \
 	-D "$working_dir" \
 	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
 	--register=no --keep-unit --as-pid2 \
diff --git a/archbuild.in b/archbuild.in
index 4b97963..e115547 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -23,14 +23,12 @@ else
 		arch_ext="-${arch}"
 	fi
 fi
-if [[ "${arch}" == 'pentium4' ]]; then
-	set_arch='i686'
-else
-	set_arch="${arch}"
-fi
 chroots='/var/lib/archbuild'
 clean_first=false
 
+setarch="$arch"
+[[ "$setarch" = "pentium4" ]] && setarch="i686"
+
 usage() {
 	echo "Usage: $cmd [options] -- [makechrootpkg args]"
 	echo '    -h         This help'
@@ -79,7 +77,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 
 	rm -rf --one-file-system "${chroots}/${repo}-${arch}"
 	mkdir -p "${chroots}/${repo}-${arch}"
-	setarch "${set_arch}" mkarchroot \
+	setarch "${setarch}" mkarchroot \
 		-C "@pkgdatadir@/pacman-${repo}${arch_ext}.conf" \
 		-M "@pkgdatadir@/makepkg-${arch}.conf" \
 		${cache_dir} \
-- 
cgit v1.2.3