diff options
| -rwxr-xr-x | archPackagesUpdate | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/archPackagesUpdate b/archPackagesUpdate index 2dbf2ebb..b5f89a32 100755 --- a/archPackagesUpdate +++ b/archPackagesUpdate @@ -178,9 +178,9 @@ then # check sanity of build-chroots err=false - for chrootDir in /opt/arch* + for chrootArch in 32 64 do - [ -d "${chrootDir}" ] || continue + [ -d "/opt/arch${chrootArch}" ] || continue basePakete="$( echo ' pacman -Qg base base-devel | \ @@ -188,7 +188,7 @@ then sort -u exit ' | \ - chrootUnpriv "${chrootDir}" + chrootUnpriv "${chrootArch}" )" explizitinstalliertePakete="$( echo ' @@ -196,7 +196,7 @@ then cut -d " " -f 1 exit ' | \ - chrootUnpriv "${chrootDir}" + chrootUnpriv "${chrootArch}" )" alleinstalliertenPakete="$( echo ' @@ -204,7 +204,7 @@ then cut -d " " -f 1 exit ' | \ - chrootUnpriv "${chrootDir}" + chrootUnpriv "${chrootArch}" )" zuvielePakete="$( ( @@ -235,13 +235,13 @@ then if [ -n "${zuvielePakete}" ] then - >&2 echo 'zu viele Pakete in "'${chrootDir}'" installiert:' + >&2 echo 'zu viele Pakete in "'/opt/arch${chrootDir}'" installiert:' >&2 echo "${zuvielePakete}" err=true fi if [ -n "${zuwenigePakete}" ] then - >&2 echo 'zu wenige Pakete in "'${chrootDir}'" installiert:' + >&2 echo 'zu wenige Pakete in "'/opt/arch${chrootDir}'" installiert:' >&2 echo "${zuwenigePakete}" err=true fi @@ -277,7 +277,7 @@ then _targetHost='\''--host=i686-pc-linux-gnu'\'' makepkg --config "'"${tmpDir}"'/makepkg32.conf" --sign -fcsr --noconfirm exit $? ' | \ - chrootUnpriv /opt/arch32 + chrootUnpriv 32 err[${i}]=$? else # 64-bit is built in chroot /opt/arch64 @@ -287,7 +287,7 @@ then makepkg --config "'"${tmpDir}"'/makepkg.conf" --sign -fcsr --noconfirm exit $? ' | \ - chrootUnpriv /opt/arch64 + chrootUnpriv 64 err[${i}]=$? fi if ${abortOnMakepkgError} && [ ${err[${i}]} -ne 0 ] |