diff options
| author | Bryan Drewery <bryan@shatow.net> | 2019-12-04 07:48:33 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2019-12-04 07:48:33 +0300 |
| commit | d89cabfdbccacf646a33407a7277a290f535dd5f (patch) | |
| tree | 425a3a1b8b5ed688e87f1311acbc7926898dcd83 /src | |
| parent | b0ac83e832dac3094b3520f6fbd67b62f6ed5226 (diff) | |
More locals and quoting cleanup
Diffstat (limited to 'src')
| -rwxr-xr-x | src/share/poudriere/common.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 413528b3..52f557d2 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1810,7 +1810,7 @@ do_portbuild_mounts() { local ptname=$3 local setname=$4 local portsdir - local optionsdir opt + local optionsdir opt o # clone will inherit from the ref jail if [ ${mnt##*/} = "ref" ]; then @@ -1850,8 +1850,8 @@ do_portbuild_mounts() { ${NULLMOUNT} -o ro ${portsdir} ${mnt}${PORTSDIR} || err 1 "Failed to mount the ports directory " for o in ${OVERLAYS}; do - _pget odir ${o} mnt || err 1 "Missing mnt metadata for overlay ${o}" - ${NULLMOUNT} -o ro ${odir} ${mnt}/overlays/${o} + _pget odir "${o}" mnt || err 1 "Missing mnt metadata for overlay ${o}" + ${NULLMOUNT} -o ro "${odir}" "${mnt}/overlays/${o}" done mount_packages -o ro ${NULLMOUNT} ${DISTFILES_CACHE} ${mnt}/distfiles || @@ -2401,7 +2401,7 @@ jail_start() { local needfs="${NULLFSREF}" local needkld kldpair kld kldmodname local tomnt fs - local portbuild_uid aarchld + local portbuild_uid aarchld o lock_jail @@ -2612,7 +2612,7 @@ jail_start() { EOF for o in ${OVERLAYS}; do echo "OVERLAYS+=/overlays/${o}" - done >> ${tomnt}/etc/make.conf + done >> "${tomnt}/etc/make.conf" [ -z "${NO_FORCE_PACKAGE}" ] && \ echo "FORCE_PACKAGE=yes" >> "${tomnt}/etc/make.conf" if [ -z "${NO_PACKAGE_BUILDING}" ]; then @@ -6578,6 +6578,7 @@ compute_deps_pkg() { test_port_origin_exist() { [ $# -eq 1 ] || eargs test_port_origin_exist origin local _origin="$1" + local o for o in ${OVERLAYS}; do if [ -d "${MASTERMNT}/overlays/${o}/${_origin}" ]; then |