stagefiles: s/Require_stagefile/Require_stagefiles/

this function takes one or more required stage fileS _plural_, and exits if any are missing (or at least it does now after the refactor). let's rename it to make things more clear Gbp-Dch: Short
2020-03-15 13:05:44 +00:00 · 2020-03-15 13:05:44 +00:00 · fb0790cc43
parent fe0d2358b9
commit fb0790cc43
56 changed files with 56 additions and 56 deletions
--- a/functions/stagefile.sh
+++ b/functions/stagefile.sh
@ -64,7 +64,7 @@ Remove_stagefile ()
 }

 # Ensure that all specified stagefiles exist (and thus that all associated stages are complete)
-Require_stagefile ()
+Require_stagefiles ()
 {
 	if [ $# -eq 0 ]; then
 		Echo_warning "Bad `Require_stagefile` usage, no params were supplied"
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@ -27,7 +27,7 @@ then
 fi

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_chroot
+++ b/scripts/build/binary_chroot
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin copying chroot..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@ -32,7 +32,7 @@ esac
 Echo_message "Begin installing disk information..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_grub-efi
+++ b/scripts/build/binary_grub-efi
@ -26,7 +26,7 @@ Check_Any_Bootloader_Role "grub-efi"
 Echo_message "Begin preparing Grub based EFI support..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@ -26,7 +26,7 @@ Check_First_Bootloader_Role "grub-legacy"
 Echo_message "Begin installing grub-legacy..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@ -26,7 +26,7 @@ Check_Any_Bootloader_Role "grub-pc"
 Echo_message "Begin installing grub-pc..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@ -29,7 +29,7 @@ fi
 Echo_message "Begin building binary hdd image..."

 # Requiring stage file
-Require_stagefile config bootstrap chroot_proc
+Require_stagefiles config bootstrap chroot_proc

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_hooks
+++ b/scripts/build/binary_hooks
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin executing hooks..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin copying binary includes..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@ -38,7 +38,7 @@ esac
 Echo_message "Begin building binary iso image..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@ -29,7 +29,7 @@ fi
 Echo_message "Begin install linux-image..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@ -29,7 +29,7 @@ fi
 Echo_message "Begin copying loadlin..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@ -28,7 +28,7 @@ Init_config_data "${@}"
 Echo_message "Begin installing loopback.cfg..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@ -29,7 +29,7 @@ fi
 Echo_message "Begin creating manifest..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@ -29,7 +29,7 @@ fi
 Echo_message "Begin installing memtest..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@ -34,7 +34,7 @@ fi
 Echo_message "Begin building binary netboot image..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_onie
+++ b/scripts/build/binary_onie
@ -42,7 +42,7 @@ esac
 Echo_message "Begin building onie binary..."

 # Requiring stage file
-Require_stagefile config binary_iso
+Require_stagefiles config binary_iso

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin installing local package lists..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin building root filesystem image..."

 # Requiring stage file
-Require_stagefile config bootstrap binary_chroot
+Require_stagefiles config bootstrap binary_chroot

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@ -26,7 +26,7 @@ Check_Any_Bootloader_Role "syslinux"
 Echo_message "Begin installing syslinux..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@ -29,7 +29,7 @@ fi
 Echo_message "Begin building binary tarball..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@ -29,7 +29,7 @@ fi
 Echo_message "Begin copying win32-loader..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@ -34,7 +34,7 @@ fi
 Echo_message "Begin building zsync control files..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@ -29,7 +29,7 @@ fi
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 Echo_message "Configuring file /etc/apt/sources.list"

--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|install-binary|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install|install-binary)
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@ -29,7 +29,7 @@ fi
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_devpts
+++ b/scripts/build/chroot_devpts
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_firmware
+++ b/scripts/build/chroot_firmware
@ -29,7 +29,7 @@ fi
 Echo_message "Begin scheduling firmware installation..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin executing hacks..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/chroot_hooks
+++ b/scripts/build/chroot_hooks
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin executing hooks..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/chroot_hostname
+++ b/scripts/build/chroot_hostname
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_hosts
+++ b/scripts/build/chroot_hosts
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_includes
+++ b/scripts/build/chroot_includes
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin copying chroot includes..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@ -27,7 +27,7 @@ Init_config_data "${@}"
 Echo_message "Begin installing packages (${_PASS} pass)..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Set non-default stage file name
 # Setting to default name with appended action name
--- a/scripts/build/chroot_interactive
+++ b/scripts/build/chroot_interactive
@ -29,7 +29,7 @@ fi
 Echo_message "Begin interactive build..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@ -29,7 +29,7 @@ fi
 Echo_message "Begin scheduling kernel image installation..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@ -27,7 +27,7 @@ Init_config_data "${@}"
 Echo_message "Begin queueing installation of package lists (${_PASS} pass)..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Set non-default stage file name
 # Setting to default name with appended action name
--- a/scripts/build/chroot_preseed
+++ b/scripts/build/chroot_preseed
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin executing local preseeds..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/chroot_proc
+++ b/scripts/build/chroot_proc
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@ -22,7 +22,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Init_config_data "${@}"

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/chroot_tmpfs
+++ b/scripts/build/chroot_tmpfs
@ -27,7 +27,7 @@ then
 fi

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 case "${1}" in
 	install)
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@ -49,7 +49,7 @@ esac
 Echo_message "Begin installing debian-installer..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@ -27,7 +27,7 @@ then
 fi

 # Requiring stage file
-Require_stagefile config source_debian
+Require_stagefiles config source_debian

 # Checking stage file
 Check_stagefile
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@ -29,7 +29,7 @@ fi
 Echo_message "Begin downloading sources..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@ -33,7 +33,7 @@ esac
 Echo_message "Begin installing disk information..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@ -34,7 +34,7 @@ fi
 Echo_message "Begin building source hdd image..."

 # Requiring stage file
-Require_stagefile config source_debian
+Require_stagefiles config source_debian

 # Checking stage file
 Check_stagefile
--- a/scripts/build/source_hooks
+++ b/scripts/build/source_hooks
@ -24,7 +24,7 @@ Init_config_data "${@}"
 Echo_message "Begin executing hooks..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@ -38,7 +38,7 @@ esac
 Echo_message "Begin building source iso image..."

 # Requiring stage file
-Require_stagefile config source_debian
+Require_stagefiles config source_debian

 # Checking stage file
 Check_stagefile
--- a/scripts/build/source_live
+++ b/scripts/build/source_live
@ -29,7 +29,7 @@ fi
 Echo_message "Begin copying live-build configuration..."

 # Requiring stage file
-Require_stagefile config bootstrap
+Require_stagefiles config bootstrap

 # Checking stage file
 Check_stagefile
--- a/scripts/build/source_tar
+++ b/scripts/build/source_tar
@ -35,7 +35,7 @@ Echo_message "Begin building source tarball..."
 Echo_message "This may take a while."

 # Requiring stage file
-Require_stagefile config source_debian
+Require_stagefiles config source_debian

 # Checking stage file
 Check_stagefile