diff options
author | Daniel Baumann <daniel@debian.org> | 2012-08-14 19:45:47 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2012-08-24 11:38:13 +0200 |
commit | 9820490ca645b4e56b82e3ae2811b891875b4774 (patch) | |
tree | 9b32da0bbac57414b054743a67f44fdf0ee0fdf2 | |
parent | dd31503960745337067ec2a1a5914f5a0b8cef81 (diff) | |
download | vyos-live-build-9820490ca645b4e56b82e3ae2811b891875b4774.tar.gz vyos-live-build-9820490ca645b4e56b82e3ae2811b891875b4774.zip |
Switching back to use the more common ${@} instead of ${*}, it's not required in current lb_clean anymore.
-rwxr-xr-x | bin/lb | 2 | ||||
-rwxr-xr-x | scripts/build/lb_binary | 100 | ||||
-rwxr-xr-x | scripts/build/lb_binary_rootfs | 156 | ||||
-rwxr-xr-x | scripts/build/lb_bootstrap | 10 | ||||
-rwxr-xr-x | scripts/build/lb_build | 8 | ||||
-rwxr-xr-x | scripts/build/lb_chroot | 78 | ||||
-rwxr-xr-x | scripts/build/lb_clean | 2 | ||||
-rwxr-xr-x | scripts/build/lb_source | 32 |
8 files changed, 194 insertions, 194 deletions
@@ -67,7 +67,7 @@ case "${1}" in exit 1 fi - Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${*}" + Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${@}" LB=1 ${ENV} exec "${SCRIPT}" "${@}" ;; esac diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary index 4a110e5a9..e0e3e47d3 100755 --- a/scripts/build/lb_binary +++ b/scripts/build/lb_binary @@ -35,76 +35,76 @@ Set_defaults Setup_cleanup # 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_sysv-rc install ${*} - lb chroot_upstart 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_sysv-rc install ${@} + lb chroot_upstart 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_debian-installer ${*} -lb binary_memtest ${*} -lb binary_grub ${*} -lb binary_grub2 ${*} -lb binary_syslinux ${*} -lb binary_yaboot ${*} -lb binary_silo ${*} -lb binary_disk ${*} -lb binary_win32-loader ${*} -lb binary_includes ${*} -lb binary_hooks ${*} -lb binary_checksums ${*} +lb binary_package-lists ${@} +lb binary_linux-image ${@} +lb binary_debian-installer ${@} +lb binary_memtest ${@} +lb binary_grub ${@} +lb binary_grub2 ${@} +lb binary_syslinux ${@} +lb binary_yaboot ${@} +lb binary_silo ${@} +lb binary_disk ${@} +lb binary_win32-loader ${@} +lb binary_includes ${@} +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_netboot ${*} -lb binary_tar ${*} -lb binary_hdd ${*} -lb binary_virtual-hdd ${*} +lb binary_iso ${@} +lb binary_netboot ${@} +lb binary_tar ${@} +lb binary_hdd ${@} +lb binary_virtual-hdd ${@} -lb binary_zsync ${*} +lb binary_zsync ${@} if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Deconfiguring chroot rm -f .build/chroot_archives - lb chroot_apt remove ${*} - lb chroot_hostname remove ${*} - lb chroot_resolv remove ${*} - lb chroot_hosts remove ${*} - lb chroot_upstart 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_upstart 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 ${@} diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index 25230ccfe..68fae4091 100755 --- a/scripts/build/lb_binary_rootfs +++ b/scripts/build/lb_binary_rootfs @@ -157,36 +157,36 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -f .lock 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_upstart 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_upstart 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_upstart 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_upstart 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 @@ -247,36 +247,36 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -f .lock 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_upstart 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_upstart 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_upstart 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_upstart 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 @@ -397,36 +397,36 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -f .lock 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_upstart 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_upstart 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_upstart 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_upstart 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 diff --git a/scripts/build/lb_bootstrap b/scripts/build/lb_bootstrap index 319927ca2..2b84b993a 100755 --- a/scripts/build/lb_bootstrap +++ b/scripts/build/lb_bootstrap @@ -35,11 +35,11 @@ Set_defaults Setup_cleanup # Bootstrapping system -lb bootstrap_cache restore ${*} -lb bootstrap_copy ${*} -lb bootstrap_cdebootstrap ${*} -lb bootstrap_debootstrap ${*} -lb bootstrap_cache save ${*} +lb bootstrap_cache restore ${@} +lb bootstrap_copy ${@} +lb bootstrap_cdebootstrap ${@} +lb bootstrap_debootstrap ${@} +lb bootstrap_cache save ${@} # Temporary hack until we have multistrap in place case "${LB_MODE}" in diff --git a/scripts/build/lb_build b/scripts/build/lb_build index d589cf7fc..bdec9b2f5 100755 --- a/scripts/build/lb_build +++ b/scripts/build/lb_build @@ -65,13 +65,13 @@ Set_defaults Check_defaults # Bootstrapping system -lb bootstrap ${*} +lb bootstrap ${@} # Customizing chroot -lb chroot ${*} +lb chroot ${@} # Building binary images -lb binary ${*} +lb binary ${@} # Building source images -lb source ${*} +lb source ${@} diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index e6353a77d..944155b5b 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -35,30 +35,30 @@ Set_defaults Setup_cleanup # Configuring chroot -lb chroot_cache restore ${*} -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_upstart install ${*} -lb chroot_hosts install ${*} -lb chroot_resolv install ${*} -lb chroot_hostname install ${*} -lb chroot_apt install ${*} -lb chroot_archives chroot install ${*} +lb chroot_cache restore ${@} +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_upstart 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_preseed ${*} +lb chroot_linux-image ${@} +lb chroot_preseed ${@} for _PASS in install live do - lb chroot_package-lists ${_PASS} ${*} - lb chroot_install-packages ${_PASS} ${*} + lb chroot_package-lists ${_PASS} ${@} + lb chroot_install-packages ${_PASS} ${@} if [ "${_PASS}" = install ] then @@ -66,27 +66,27 @@ do fi done -lb chroot_live-packages ${*} -lb chroot_includes ${*} -lb chroot_hooks ${*} -lb chroot_hacks ${*} -lb chroot_interactive ${*} +lb chroot_live-packages ${@} +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_upstart 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_cache save ${*} +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_upstart 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_cache save ${@} diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean index 83dafb1d6..131304177 100755 --- a/scripts/build/lb_clean +++ b/scripts/build/lb_clean @@ -46,7 +46,7 @@ fi rm -f .lock -if [ -z "${*}" ] +if [ -z "${@}" ] then ARGUMENTS="--all" else diff --git a/scripts/build/lb_source b/scripts/build/lb_source index ad9e262bf..a23681770 100755 --- a/scripts/build/lb_source +++ b/scripts/build/lb_source @@ -42,25 +42,25 @@ fi Setup_cleanup # Enabling network in chroot -lb chroot_hosts install ${*} -lb chroot_resolv install ${*} -lb chroot_hostname install ${*} -lb chroot_archives source install ${*} +lb chroot_hosts install ${@} +lb chroot_resolv install ${@} +lb chroot_hostname install ${@} +lb chroot_archives source install ${@} # Preparing images -lb source_debian-live ${*} -lb source_debian ${*} -lb source_disk ${*} -lb source_checksums ${*} +lb source_debian-live ${@} +lb source_debian ${@} +lb source_disk ${@} +lb source_checksums ${@} # Building images -lb source_iso ${*} -lb source_tar ${*} -lb source_hdd ${*} -lb source_virtual-hdd ${*} +lb source_iso ${@} +lb source_tar ${@} +lb source_hdd ${@} +lb source_virtual-hdd ${@} # Deconfiguring chroot -lb chroot_archives chroot remove ${*} -lb chroot_hostname remove ${*} -lb chroot_resolv remove ${*} -lb chroot_hosts remove ${*} +lb chroot_archives chroot remove ${@} +lb chroot_hostname remove ${@} +lb chroot_resolv remove ${@} +lb chroot_hosts remove ${@} |