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/binary | |
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/binary')
-rwxr-xr-x | scripts/build/binary | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/scripts/build/binary b/scripts/build/binary index e1d28a241..bcef3f058 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -28,78 +28,78 @@ Init_config_data "${@}" Setup_clean_exit # Preparing root filesystem -lb binary_chroot ${@} +lb binary_chroot "${@}" 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_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_dpkg install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_apt install-binary ${@} - lb chroot_archives chroot install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_apt install-binary "${@}" + lb chroot_archives chroot install "${@}" fi # Building root filesystem -lb binary_rootfs ${@} -lb binary_manifest ${@} +lb binary_rootfs "${@}" +lb binary_manifest "${@}" # Prepare images -lb binary_package-lists ${@} -lb binary_linux-image ${@} -lb binary_memtest ${@} -lb binary_grub-legacy ${@} -lb binary_grub-pc ${@} -lb binary_loopback_cfg ${@} -lb binary_syslinux ${@} -lb binary_disk ${@} -lb binary_loadlin ${@} -lb binary_win32-loader ${@} -lb binary_includes ${@} -lb binary_grub-efi ${@} -lb binary_hooks ${@} -lb binary_checksums ${@} +lb binary_package-lists "${@}" +lb binary_linux-image "${@}" +lb binary_memtest "${@}" +lb binary_grub-legacy "${@}" +lb binary_grub-pc "${@}" +lb binary_loopback_cfg "${@}" +lb binary_syslinux "${@}" +lb binary_disk "${@}" +lb binary_loadlin "${@}" +lb binary_win32-loader "${@}" +lb binary_includes "${@}" +lb binary_grub-efi "${@}" +lb binary_hooks "${@}" +lb binary_checksums "${@}" if [ "${LB_BUILD_WITH_CHROOT}" != "true" ] then - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" fi # Building images -lb binary_iso ${@} -lb binary_onie ${@} -lb binary_netboot ${@} -lb binary_tar ${@} -lb binary_hdd ${@} +lb binary_iso "${@}" +lb binary_onie "${@}" +lb binary_netboot "${@}" +lb binary_tar "${@}" +lb binary_hdd "${@}" -lb binary_zsync ${@} +lb binary_zsync "${@}" if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Deconfiguring chroot Remove_stagefile chroot_archives - 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_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 "${@}" fi -lb chroot_sysfs remove ${@} -lb chroot_selinuxfs remove ${@} -lb chroot_proc remove ${@} -lb chroot_devpts remove ${@} +lb chroot_sysfs remove "${@}" +lb chroot_selinuxfs remove "${@}" +lb chroot_proc remove "${@}" +lb chroot_devpts remove "${@}" Echo_message "Binary stage completed" |