diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-01 09:29:52 +0100 |
---|---|---|
committer | Raphaƫl Hertzog <hertzog@debian.org> | 2020-04-23 09:38:01 +0000 |
commit | 11836c0c18b07f4bd1ea22a2163875975f3e6816 (patch) | |
tree | a3534b7d09a538fecec2379fdba0a7c6a12247a2 /scripts/build/installer | |
parent | f6a50b6db204fa1a6d0ae8b371c4108911aed0eb (diff) | |
download | vyos-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/installer')
-rwxr-xr-x | scripts/build/installer | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/scripts/build/installer b/scripts/build/installer index 56ed724f4..3054861dc 100755 --- a/scripts/build/installer +++ b/scripts/build/installer @@ -30,41 +30,41 @@ Setup_clean_exit if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # 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 "${@}" fi # Building installer -lb installer_debian-installer ${@} -lb installer_preseed ${@} +lb installer_debian-installer "${@}" +lb installer_preseed "${@}" if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # 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 "${@}" fi Echo_message "Installer stage completed" |