diff options
| author | Erich Eckner <git@eckner.net> | 2016-04-20 11:38:51 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2016-04-20 11:38:51 +0200 |
| commit | 1b035d7c947ff5fc9c9324ea43dd21e5cb69fa62 (patch) | |
| tree | aea65c91f12bd58d712c1036ce0ac6dd7dcba055 /archPackagesUpdate | |
| parent | f2ca9782a1c55e629ff2eb4cd001f8f920fe8f43 (diff) | |
| download | archlinuxewe.git.save-1b035d7c947ff5fc9c9324ea43dd21e5cb69fa62.tar.xz | |
archPackagesUpdate cleans cache before every build
Diffstat (limited to 'archPackagesUpdate')
| -rwxr-xr-x | archPackagesUpdate | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/archPackagesUpdate b/archPackagesUpdate index 4d6c88b5..58ee720d 100755 --- a/archPackagesUpdate +++ b/archPackagesUpdate @@ -298,19 +298,6 @@ then ${err} && exit 1 -# clean pacman cache - if ${cleanCache} - then - for chrootArch in 32 64 - do - echo ' - sudo pacman -Sc --noconfirm - exit - ' | \ - chrootUnpriv "${chrootArch}" - done - fi - maxErr=0 # generate current makepkg.conf and makepkg32.conf @@ -334,22 +321,30 @@ then if [ "${arch}" == "i686" ] then # 32-bit is built in chroot /opt/arch32 - echo '\ - sudo pacman -Sy && \ - cd "'"${tmpDir}/${paket}"'" && \ - _targetHost='\''--host=i686-pc-linux-gnu'\'' makepkg --config "'"${tmpDir}"'/makepkg32.conf" -fcsr --noconfirm - exit $? - ' | \ + ( + ${cleanCache} && \ + echo 'sudo pacman -Sc --noconfirm && \' + echo '\ + sudo pacman -Sy && \ + cd "'"${tmpDir}/${paket}"'" && \ + _targetHost='\''--host=i686-pc-linux-gnu'\'' makepkg --config "'"${tmpDir}"'/makepkg32.conf" -fcsr --noconfirm + exit $? + ' + ) | \ chrootUnpriv 32 err[${i}]=$? else # 64-bit is built in chroot /opt/arch64 - echo '\ - sudo pacman -Sy && \ - cd "'"${tmpDir}/${paket}"'" && \ - makepkg --config "'"${tmpDir}"'/makepkg.conf" -fcsr --noconfirm - exit $? - ' | \ + ( + ${cleanCache} && \ + echo 'sudo pacman -Sc --noconfirm && \' + echo '\ + sudo pacman -Sy && \ + cd "'"${tmpDir}/${paket}"'" && \ + makepkg --config "'"${tmpDir}"'/makepkg.conf" -fcsr --noconfirm + exit $? + ' + ) | \ chrootUnpriv 64 err[${i}]=$? fi |