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

1 files changed, 39 insertions, 41 deletions

diff --git a/scripts/build/chroot b/scripts/build/chroot
index 09c09e15e..ad15ff0a2 100755
--- a/scripts/build/chroot
+++ b/scripts/build/chroot
@@ -28,63 +28,61 @@ Init_config_data "${@}"
 Setup_clean_exit
 
 # Restoring cached live OS chroot from cache
-lb chroot_cache restore ${@}
+lb chroot_cache restore "${@}"
 
 # Configuring 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_tmpfs 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 chroot 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_tmpfs 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 chroot install "${@}"
 
 # Customizing chroot
-lb chroot_linux-image ${@}
-lb chroot_firmware ${@}
-lb chroot_preseed ${@}
+lb chroot_linux-image "${@}"
+lb chroot_firmware "${@}"
+lb chroot_preseed "${@}"
 
-for _PASS in install live
-do
-	lb chroot_package-lists ${_PASS} ${@}
-	lb chroot_install-packages ${_PASS} ${@}
+for _PASS in install live; do
+	lb chroot_package-lists ${_PASS} "${@}"
+	lb chroot_install-packages ${_PASS} "${@}"
 
-	if [ "${_PASS}" = install ]
-	then
+	if [ "${_PASS}" = install ]; then
 		Chroot chroot "dpkg-query -W" > chroot.packages.install
 	fi
 done
 
-lb chroot_includes ${@}
-lb chroot_hooks ${@}
-lb chroot_hacks ${@}
-lb chroot_interactive ${@}
+lb chroot_includes "${@}"
+lb chroot_hooks "${@}"
+lb chroot_hacks "${@}"
+lb chroot_interactive "${@}"
 
 Chroot chroot "dpkg-query -W" > chroot.packages.live
 
 # Deconfiguring chroot
-lb chroot_archives chroot remove ${@}
-lb chroot_apt remove ${@}
-lb chroot_hostname remove ${@}
-lb chroot_resolv remove ${@}
-lb chroot_hosts remove ${@}
-lb chroot_sysv-rc remove ${@}
-lb chroot_tmpfs 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 chroot remove "${@}"
+lb chroot_apt remove "${@}"
+lb chroot_hostname remove "${@}"
+lb chroot_resolv remove "${@}"
+lb chroot_hosts remove "${@}"
+lb chroot_sysv-rc remove "${@}"
+lb chroot_tmpfs 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 "${@}"
 
 # Saving live OS chroot to cache
-lb chroot_cache save ${@}
+lb chroot_cache save "${@}"
 
 Chroot chroot "ls -lR" > chroot.files