diff options
Diffstat (limited to 'build-pkg-arch')
| -rw-r--r-- | build-pkg-arch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build-pkg-arch b/build-pkg-arch index 2dc321d..be5dac5 100644 --- a/build-pkg-arch +++ b/build-pkg-arch @@ -22,10 +22,10 @@ ################################################################ pkg_initdb_arch() { - mkdir -p $BUILD_ROOT/var/lib/pacman/sync - touch $BUILD_ROOT/var/lib/pacman/sync/core.db - touch $BUILD_ROOT/var/lib/pacman/sync/extra.db - touch $BUILD_ROOT/var/lib/pacman/sync/community.db + mkdir -p "$BUILD_ROOT"/var/lib/pacman/sync + touch "$BUILD_ROOT"/var/lib/pacman/sync/core.db + touch "$BUILD_ROOT"/var/lib/pacman/sync/extra.db + touch "$BUILD_ROOT"/var/lib/pacman/sync/community.db } pkg_prepare_arch() { @@ -33,7 +33,7 @@ pkg_prepare_arch() { } pkg_erase_arch() { - ( cd $BUILD_ROOT && chroot $BUILD_ROOT pacman -R -n -d -d --noconfirm $PKG 2>&1 || touch $BUILD_ROOT/exit ) | \ + ( cd "$BUILD_ROOT" && chroot "$BUILD_ROOT" pacman -R -n -d -d --noconfirm $PKG 2>&1 || touch "$BUILD_ROOT"/exit ) | \ perl -ne '$|=1;/^(Total Removed Size: |Packages \(\d+\):|:: Do you want to remove these packages|deleting |removing | )/||/^$/||print' } @@ -48,9 +48,9 @@ pkg_cumulate_arch() { pkg_install_arch() { # Pacman can't handle chroot # https://bbs.archlinux.org/viewtopic.php?id=129661 - (cd $BUILD_ROOT/etc && sed -i "s/^CheckSpace/#CheckSpace/g" pacman.conf) + (cd "$BUILD_ROOT"/etc && sed -i "s/^CheckSpace/#CheckSpace/g" pacman.conf) # -d -d disables deps checking - ( cd $BUILD_ROOT && chroot $BUILD_ROOT pacman -U --force -d -d --noconfirm .init_b_cache/$PKG.$PSUF 2>&1 || touch $BUILD_ROOT/exit ) | \ + ( cd "$BUILD_ROOT" && chroot "$BUILD_ROOT" pacman -U --force -d -d --noconfirm .init_b_cache/$PKG.$PSUF 2>&1 || touch "$BUILD_ROOT"/exit ) | \ perl -ne '$|=1;/^(warning: could not get filesystem information for |loading packages|looking for inter-conflicts|looking for conflicting packages|Targets |Total Installed Size: |Net Upgrade Size: |Proceed with installation|checking package integrity|loading package files|checking for file conflicts|checking keyring|Packages \(\d+\)|:: Proceed with installation|:: Processing package changes|checking available disk space|installing |upgrading |warning:.*is up to date -- reinstalling|Optional dependencies for| )/||/^$/||print' } @@ -68,9 +68,9 @@ pkg_preinstall_arch() { } pkg_runscripts_arch() { - if test -e "$BUILD_ROOT/.init_b_cache/scripts/$PKG.post" ; then + if test -e "'$BUILD_ROOT'/.init_b_cache/scripts/$PKG.post" ; then echo "running $PKG postinstall script" - ( cd $BUILD_ROOT && chroot $BUILD_ROOT ".init_b_cache/scripts/$PKG.post" < /dev/null ) + ( cd "$BUILD_ROOT" && chroot "$BUILD_ROOT" ".init_b_cache/scripts/$PKG.post" < /dev/null ) rm -f "$BUILD_ROOT/.init_b_cache/scripts/$PKG.post" fi } |