From 919a464b64b4bda52a56b8732ea5ef7727649cf0 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Tue, 5 May 2020 16:42:44 +0100 Subject: s/Install_package/Install_packages/ it installs one or more, so should be plural for clarity Gbp-Dch: Short --- scripts/build/binary_grub-efi | 6 +++--- scripts/build/binary_grub-legacy | 2 +- scripts/build/binary_grub-pc | 2 +- scripts/build/binary_hdd | 2 +- scripts/build/binary_iso | 2 +- scripts/build/binary_loadlin | 2 +- scripts/build/binary_memtest | 2 +- scripts/build/binary_package-lists | 2 +- scripts/build/binary_rootfs | 6 +++--- scripts/build/binary_syslinux | 2 +- scripts/build/binary_win32-loader | 2 +- scripts/build/binary_zsync | 2 +- scripts/build/chroot_archives | 2 +- scripts/build/chroot_package-lists | 2 +- scripts/build/chroot_preseed | 2 +- scripts/build/installer_debian-installer | 2 +- scripts/build/source_hdd | 2 +- scripts/build/source_iso | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) (limited to 'scripts') diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi index a7181bfed..d94b25815 100755 --- a/scripts/build/binary_grub-efi +++ b/scripts/build/binary_grub-efi @@ -90,7 +90,7 @@ case "${LB_UEFI_SECURE_BOOT}" in auto) # Use Check_installed, as Check_package will error out immediately set +e - Install_package + Install_packages set -e Check_installed chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/gcd${_SB_EFI_NAME}.efi.signed \ grub-efi-${_SB_EFI_DEB}-signed @@ -110,7 +110,7 @@ case "${LB_UEFI_SECURE_BOOT}" in grub-efi-${_SB_EFI_DEB}-signed Check_package chroot /usr/lib/shim/shim${_SB_EFI_NAME}.efi.signed \ shim-signed - Install_package + Install_packages Echo_message "UEFI Secure Boot support enabled." ;; disable) @@ -123,7 +123,7 @@ _LB_PACKAGES="${_PRE_SB_PACKAGES}" Restore_package_cache binary # Installing depends -Install_package +Install_packages # Cleanup files that we generate rm -rf binary/boot/efi.img binary/boot/grub/i386-efi/ binary/boot/grub/x86_64-efi binary/boot/grub/arm64-efi binary/boot/grub/arm-efi diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy index 4acbd2e50..f4246497e 100755 --- a/scripts/build/binary_grub-legacy +++ b/scripts/build/binary_grub-legacy @@ -51,7 +51,7 @@ Check_package chroot /usr/sbin/grub grub-legacy Restore_package_cache binary # Installing depends -Install_package +Install_packages # Local functions Grub_live_entry () diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc index 9fca63272..95b781e42 100755 --- a/scripts/build/binary_grub-pc +++ b/scripts/build/binary_grub-pc @@ -53,7 +53,7 @@ Check_package chroot /usr/bin/grub-mkimage grub-pc Restore_package_cache binary # Installing depends -Install_package +Install_packages # Copying templates mkdir -p binary/boot/grub/i386-pc diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index c6aeedb15..68e5072b7 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -78,7 +78,7 @@ esac Restore_package_cache binary # Installing depends -Install_package +Install_packages # Remove old binary if [ -f ${LB_IMAGE_NAME}.img ] diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index e4c98368c..d52ef1fa2 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -54,7 +54,7 @@ Check_package chroot /usr/lib/ISOLINUX/isohdpfx.bin isolinux Restore_package_cache binary # Installing depends -Install_package +Install_packages # Remove old iso image if [ -f ${IMAGE} ] diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin index 0487d4d24..29e30e9c3 100755 --- a/scripts/build/binary_loadlin +++ b/scripts/build/binary_loadlin @@ -46,7 +46,7 @@ case "${LB_ARCHITECTURE}" in Restore_package_cache binary # Installing depends - Install_package + Install_packages case "${LB_BUILD_WITH_CHROOT}" in true) diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest index 2ad1f10cf..656972572 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -70,7 +70,7 @@ esac Restore_package_cache binary # Installing depends -Install_package +Install_packages # Setting destination directory case "${LB_INITRAMFS}" in diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index 60ec76b7b..4b05bd0b4 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -46,7 +46,7 @@ then Restore_package_cache chroot # Installing depends - Install_package + Install_packages if [ -e "${LIVE_BUILD}/share/bin/Packages" ] then diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index c6b329fbf..57d933125 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -78,7 +78,7 @@ case "${LB_CHROOT_FILESYSTEM}" in Restore_package_cache binary # Installing depends - Install_package + Install_packages # Remove old image if [ -f binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} ] @@ -176,7 +176,7 @@ case "${LB_CHROOT_FILESYSTEM}" in Restore_package_cache binary # Installing depends - Install_package + Install_packages # Remove old jffs2 image if [ -f binary/${INITFS}/filesystem.jffs2 ] @@ -251,7 +251,7 @@ case "${LB_CHROOT_FILESYSTEM}" in Restore_package_cache binary # Installing depends - Install_package + Install_packages Echo_message "Preparing squashfs image..." Echo_message "This may take a while." diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index d4f4bf272..08bf5a2a0 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -101,7 +101,7 @@ Check_package chroot /usr/bin/rsvg-convert librsvg2-bin Restore_package_cache binary # Installing depends -Install_package +Install_packages # Ensure fresh rm -rf ${_TARGET} diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index 9dba191b6..964723517 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -48,7 +48,7 @@ case "${LB_ARCHITECTURE}" in Restore_package_cache binary # Installing depends - Install_package + Install_packages if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync index 937eedd4e..b4477d75d 100755 --- a/scripts/build/binary_zsync +++ b/scripts/build/binary_zsync @@ -49,7 +49,7 @@ Check_package chroot /usr/bin/zsyncmake zsync Restore_package_cache binary # Installing depends -Install_package +Install_packages case "${LB_IMAGE_TYPE}" in iso) diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 020155c72..63d3e7209 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -166,7 +166,7 @@ case "${_ACTION}" in Check_package chroot /usr/bin/apt-ftparchive apt-utils # Installing depends - Install_package + Install_packages # Generate Packages and Packages.gz echo "cd /root/packages && apt-ftparchive packages . > Packages" | Chroot chroot sh diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists index 735f152c8..ae51b2bc4 100755 --- a/scripts/build/chroot_package-lists +++ b/scripts/build/chroot_package-lists @@ -54,7 +54,7 @@ Check_package chroot /usr/bin/grep-aptavail dctrl-tools Restore_package_cache chroot # Installing depends -Install_package +Install_packages if [ -e "${LIVE_BUILD}/share/bin/Packages" ] then diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed index 11144bed9..e049f5c86 100755 --- a/scripts/build/chroot_preseed +++ b/scripts/build/chroot_preseed @@ -40,7 +40,7 @@ then Check_package chroot /usr/bin/debconf-set-selections debconf # Install dependency - Install_package + Install_packages for PRESEED in config/preseed/*.cfg config/preseed/*.cfg.chroot chroot/root/packages.chroot.cfg do diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 97128fb35..76349cee6 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -47,7 +47,7 @@ Check_package chroot /usr/bin/apt-ftparchive apt-utils Restore_package_cache binary # Installing depends -Install_package +Install_packages if [ "${_DEBUG}" = "true" ] then diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd index 613bdc96f..7948a3fd0 100755 --- a/scripts/build/source_hdd +++ b/scripts/build/source_hdd @@ -48,7 +48,7 @@ Check_package host /sbin/fdisk fdisk Check_package host /sbin/losetup mount # Installing depends -Install_package +Install_packages # Remove old source if [ -f ${LB_IMAGE_NAME}-source.img ] diff --git a/scripts/build/source_iso b/scripts/build/source_iso index 7c4f67f17..e53a574b9 100755 --- a/scripts/build/source_iso +++ b/scripts/build/source_iso @@ -50,7 +50,7 @@ Acquire_lockfile Check_package chroot /usr/bin/xorriso xorriso # Installing depends -Install_package +Install_packages # Remove old iso image if [ -f ${LB_IMAGE_NAME}-source.iso ] -- cgit v1.2.3