summaryrefslogtreecommitdiff
path: root/scripts/build/binary_rootfs
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-04-01 09:29:52 +0100
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 09:38:01 +0000
commit11836c0c18b07f4bd1ea22a2163875975f3e6816 (patch)
treea3534b7d09a538fecec2379fdba0a7c6a12247a2 /scripts/build/binary_rootfs
parentf6a50b6db204fa1a6d0ae8b371c4108911aed0eb (diff)
downloadvyos-live-build-11836c0c18b07f4bd1ea22a2163875975f3e6816.tar.gz
vyos-live-build-11836c0c18b07f4bd1ea22a2163875975f3e6816.zip
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
Diffstat (limited to 'scripts/build/binary_rootfs')
-rwxr-xr-xscripts/build/binary_rootfs144
1 files changed, 72 insertions, 72 deletions
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