From 18eefdd6f38631e15e56a2bd7a25bba50b05acfa Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Tue, 5 May 2020 16:45:57 +0100 Subject: s/Remove_package/Remove_packages/ it removes one or more, so should be plural for clarity Gbp-Dch: Short --- functions/packages.sh | 4 ++-- scripts/build/binary_grub-efi | 2 +- 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 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/functions/packages.sh b/functions/packages.sh index b9fa28611..83d15e09e 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -63,7 +63,7 @@ Install_packages () unset _LB_PACKAGES # Can clear this now } -Remove_package () +Remove_packages () { if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]; then return @@ -102,7 +102,7 @@ Remove_package () Cleanup_temp_packages () { if [ -e "$(Installed_tmp_packages_file)" ]; then - Remove_package + Remove_packages fi } diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi index d94b25815..9cb105370 100755 --- a/scripts/build/binary_grub-efi +++ b/scripts/build/binary_grub-efi @@ -273,7 +273,7 @@ case "${LB_BUILD_WITH_CHROOT}" in Save_package_cache binary # Removing depends - Remove_package + Remove_packages ;; false) diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy index f4246497e..1b5f3ebb6 100755 --- a/scripts/build/binary_grub-legacy +++ b/scripts/build/binary_grub-legacy @@ -229,7 +229,7 @@ sed -i -e 's|\ $||g' binary/boot/grub/menu.lst Save_package_cache binary # Removing depends -Remove_package +Remove_packages # Creating stage file Create_stagefile diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc index 95b781e42..aaef7c9a2 100755 --- a/scripts/build/binary_grub-pc +++ b/scripts/build/binary_grub-pc @@ -114,7 +114,7 @@ fi Save_package_cache binary # Removing depends -Remove_package +Remove_packages # Creating stage file Create_stagefile diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index 68e5072b7..ac5247b19 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -341,7 +341,7 @@ mv chroot/binary.img ${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.img Save_package_cache binary # Removing depends -Remove_package +Remove_packages # Creating stage file Create_stagefile diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index d52ef1fa2..e5724c32c 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -199,7 +199,7 @@ esac Save_package_cache binary # Removing depends -Remove_package +Remove_packages # Creating stage file Create_stagefile diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin index 29e30e9c3..25473f11b 100755 --- a/scripts/build/binary_loadlin +++ b/scripts/build/binary_loadlin @@ -67,7 +67,7 @@ case "${LB_ARCHITECTURE}" in Save_package_cache binary # Removing depends - Remove_package + Remove_packages mkdir -p binary/install diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest index 656972572..de9bedf85 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -101,7 +101,7 @@ esac Save_package_cache binary # Removing depends -Remove_package +Remove_packages if [ "${GRUB}" ] then diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index 4b05bd0b4..6d9932a5b 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -159,7 +159,7 @@ then rm -rf chroot/binary.deb # Removing depends - Remove_package + Remove_packages # Saving cache Save_package_cache chroot diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 57d933125..02941e11b 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -147,7 +147,7 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -rf chroot/chroot # Removing depends - Remove_package + Remove_packages fi ;; @@ -213,7 +213,7 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -rf chroot/chroot # Removing depends - Remove_package + Remove_packages fi ;; @@ -326,7 +326,7 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -rf chroot/chroot # Removing depends - Remove_package + Remove_packages fi ;; diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 08bf5a2a0..17ff10153 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -326,7 +326,7 @@ case "${LB_BUILD_WITH_CHROOT}" in Save_package_cache binary # Removing depends - Remove_package + Remove_packages ;; esac diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index 964723517..18fccfa64 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -109,7 +109,7 @@ EOF Save_package_cache binary # Removing depends - Remove_package + Remove_packages ;; *) diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync index b4477d75d..6dec09fb7 100755 --- a/scripts/build/binary_zsync +++ b/scripts/build/binary_zsync @@ -118,7 +118,7 @@ done Save_package_cache binary # Removing depends -Remove_package +Remove_packages # Creating stage file Create_stagefile diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 63d3e7209..6e22320a5 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -187,7 +187,7 @@ case "${_ACTION}" in fi # Removing depends - Remove_package + Remove_packages else Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'." fi diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists index ae51b2bc4..8f6a3fe56 100755 --- a/scripts/build/chroot_package-lists +++ b/scripts/build/chroot_package-lists @@ -88,7 +88,7 @@ done rm -f chroot/bin/Packages -Remove_package +Remove_packages # Saving cache Save_package_cache chroot diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed index e049f5c86..7623676d1 100755 --- a/scripts/build/chroot_preseed +++ b/scripts/build/chroot_preseed @@ -74,7 +74,7 @@ then rm -f chroot/root/packages.chroot.cfg # Remove dependency - Remove_package + Remove_packages fi # Creating stage file diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 76349cee6..3b615b0c2 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -829,7 +829,7 @@ fi Save_package_cache binary # Removing depends -Remove_package +Remove_packages # Creating stage file Create_stagefile diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd index 7948a3fd0..e207c1f9f 100755 --- a/scripts/build/source_hdd +++ b/scripts/build/source_hdd @@ -144,7 +144,7 @@ if $MAKEDEV; then fi # Removing depends -Remove_package +Remove_packages # Creating stage file Create_stagefile diff --git a/scripts/build/source_iso b/scripts/build/source_iso index e53a574b9..f3cd90903 100755 --- a/scripts/build/source_iso +++ b/scripts/build/source_iso @@ -112,7 +112,7 @@ mv chroot/source.iso ${LB_IMAGE_NAME}-source.iso rm -f chroot/source.sh # Removing depends -Remove_package +Remove_packages # Creating stage file Create_stagefile -- cgit v1.2.3