diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2017-02-15 15:25:22 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2017-04-05 14:42:43 -0400 |
| commit | 05ff74daefaa878a82e82e4b025bb3d8bd23ddf1 (patch) | |
| tree | 682f8c94fcc73b63534d4e336bfee83ef75e9423 | |
| parent | 8ff392c0524ac24a48c3dfc8a2c6a8363f28d7f2 (diff) | |
| download | devtools32-05ff74daefaa878a82e82e4b025bb3d8bd23ddf1.tar.xz | |
makechrootpkg: Adjust to have the functions work with `set -u`.
Even though main() doesn't call `set -u`; this way the functions will
continue to work if copied into an environment with `set -u`, or so
that we are ready if we ever want to start using `set -u`.
| -rw-r--r-- | makechrootpkg.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index bdcaa88..f22fe49 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -32,7 +32,7 @@ bindmounts_ro=() bindmounts_rw=() copy=$USER -[[ -n $SUDO_USER ]] && copy=$SUDO_USER +[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER [[ -z "$copy" || $copy = root ]] && copy=copy src_owner=${SUDO_USER:-$USER} @@ -90,7 +90,7 @@ load_vars() { [[ -f $makepkg_conf ]] || return 1 for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do - [[ -z ${!var} ]] && eval $(grep "^${var}=" "$makepkg_conf") + [[ -z ${!var:-} ]] && eval $(grep "^${var}=" "$makepkg_conf") done return 0 @@ -209,7 +209,7 @@ prepare_chroot() { sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf" for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \ - "MAKEFLAGS='$MAKEFLAGS'" "PACKAGER='$PACKAGER'" + "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'" do grep -q "^$x" "$copydir/etc/makepkg.conf" && continue echo "$x" >>"$copydir/etc/makepkg.conf" @@ -384,7 +384,7 @@ $update_first && arch-nspawn "$copydir" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ pacman -Syu --noconfirm -if [[ -n ${install_pkgs[*]} ]]; then +if [[ -n ${install_pkgs[*]:-} ]]; then install_packages "$copydir" "${install_pkgs[@]}" ret=$? # If there is no PKGBUILD we have done |