From 11836c0c18b07f4bd1ea22a2163875975f3e6816 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Wed, 1 Apr 2020 09:29:52 +0100 Subject: fix $@ parameter expansion issues $@ when unquoted is subject to further word splitting. this fixes a bunch of instances where it was incorrectly being used unquoted. Gbp-Dch: Short --- scripts/build/binary_rootfs | 144 ++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 72 deletions(-) (limited to 'scripts/build/binary_rootfs') diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index b0a9e22d4..97f25534a 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -135,34 +135,34 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary remove ${@} - lb chroot_apt remove ${@} - lb chroot_hostname remove ${@} - lb chroot_resolv remove ${@} - lb chroot_hosts remove ${@} - lb chroot_sysv-rc remove ${@} - lb chroot_dpkg remove ${@} - lb chroot_debianchroot remove ${@} - lb chroot_sysfs remove ${@} - lb chroot_selinuxfs remove ${@} - lb chroot_proc remove ${@} - lb chroot_devpts remove ${@} + lb chroot_archives binary remove "${@}" + lb chroot_apt remove "${@}" + lb chroot_hostname remove "${@}" + lb chroot_resolv remove "${@}" + lb chroot_hosts remove "${@}" + lb chroot_sysv-rc remove "${@}" + lb chroot_dpkg remove "${@}" + lb chroot_debianchroot remove "${@}" + lb chroot_sysfs remove "${@}" + lb chroot_selinuxfs remove "${@}" + lb chroot_proc remove "${@}" + lb chroot_devpts remove "${@}" rm -rf chroot mv chroot.tmp chroot - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} - lb chroot_debianchroot install ${@} - lb chroot_dpkg install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_apt install ${@} - lb chroot_archives binary install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_debianchroot install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_apt install "${@}" + lb chroot_archives binary install "${@}" touch .lock else @@ -223,34 +223,34 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary remove ${@} - lb chroot_apt remove ${@} - lb chroot_hostname remove ${@} - lb chroot_resolv remove ${@} - lb chroot_hosts remove ${@} - lb chroot_sysv-rc remove ${@} - lb chroot_dpkg remove ${@} - lb chroot_debianchroot remove ${@} - lb chroot_sysfs remove ${@} - lb chroot_selinuxfs remove ${@} - lb chroot_proc remove ${@} - lb chroot_devpts remove ${@} + lb chroot_archives binary remove "${@}" + lb chroot_apt remove "${@}" + lb chroot_hostname remove "${@}" + lb chroot_resolv remove "${@}" + lb chroot_hosts remove "${@}" + lb chroot_sysv-rc remove "${@}" + lb chroot_dpkg remove "${@}" + lb chroot_debianchroot remove "${@}" + lb chroot_sysfs remove "${@}" + lb chroot_selinuxfs remove "${@}" + lb chroot_proc remove "${@}" + lb chroot_devpts remove "${@}" rm -rf chroot mv chroot.tmp chroot - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} - lb chroot_debianchroot install ${@} - lb chroot_dpkg install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_apt install ${@} - lb chroot_archives binary install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_debianchroot install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_apt install "${@}" + lb chroot_archives binary install "${@}" touch .lock else @@ -358,34 +358,34 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary remove ${@} - lb chroot_apt remove ${@} - lb chroot_hostname remove ${@} - lb chroot_resolv remove ${@} - lb chroot_hosts remove ${@} - lb chroot_sysv-rc remove ${@} - lb chroot_dpkg remove ${@} - lb chroot_debianchroot remove ${@} - lb chroot_sysfs remove ${@} - lb chroot_selinuxfs remove ${@} - lb chroot_proc remove ${@} - lb chroot_devpts remove ${@} + lb chroot_archives binary remove "${@}" + lb chroot_apt remove "${@}" + lb chroot_hostname remove "${@}" + lb chroot_resolv remove "${@}" + lb chroot_hosts remove "${@}" + lb chroot_sysv-rc remove "${@}" + lb chroot_dpkg remove "${@}" + lb chroot_debianchroot remove "${@}" + lb chroot_sysfs remove "${@}" + lb chroot_selinuxfs remove "${@}" + lb chroot_proc remove "${@}" + lb chroot_devpts remove "${@}" rm -rf chroot mv chroot.tmp chroot - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} - lb chroot_debianchroot install ${@} - lb chroot_dpkg install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_apt install ${@} - lb chroot_archives binary install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_debianchroot install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_apt install "${@}" + lb chroot_archives binary install "${@}" touch .lock else -- cgit v1.2.3