manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/Remove_package/Remove_packages/ 

it removes one or more, so should be plural for clarity

Gbp-Dch: Short
This commit is contained in:
Lyndon Brown 2020-05-05 16:45:57 +01:00
parent 919a464b64
commit 18eefdd6f3
19 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions/packages.sh
View File

@ -63,7 +63,7 @@ Install_packages ()
unset _LB_PACKAGES # Can clear this now unset _LB_PACKAGES # Can clear this now
} }
Remove_package () Remove_packages ()
{ {
if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]; then if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]; then
return return
@ -102,7 +102,7 @@ Remove_package ()
Cleanup_temp_packages () Cleanup_temp_packages ()
{ {
if [ -e "$(Installed_tmp_packages_file)" ]; then if [ -e "$(Installed_tmp_packages_file)" ]; then
Remove_package Remove_packages
fi fi
} }

2
scripts/build/binary_grub-efi
View File

@ -273,7 +273,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
;; ;;
false) false)

2
scripts/build/binary_grub-legacy
View File

@ -229,7 +229,7 @@ sed -i -e 's|\ $||g' binary/boot/grub/menu.lst
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
# Creating stage file # Creating stage file
Create_stagefile Create_stagefile

2
scripts/build/binary_grub-pc
View File

@ -114,7 +114,7 @@ fi
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
# Creating stage file # Creating stage file
Create_stagefile Create_stagefile

2
scripts/build/binary_hdd
View File

@ -341,7 +341,7 @@ mv chroot/binary.img ${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.img
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
# Creating stage file # Creating stage file
Create_stagefile Create_stagefile

2
scripts/build/binary_iso
View File

@ -199,7 +199,7 @@ esac
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
# Creating stage file # Creating stage file
Create_stagefile Create_stagefile

2
scripts/build/binary_loadlin
View File

@ -67,7 +67,7 @@ case "${LB_ARCHITECTURE}" in
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
mkdir -p binary/install mkdir -p binary/install

2
scripts/build/binary_memtest
View File

@ -101,7 +101,7 @@ esac
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
if [ "${GRUB}" ] if [ "${GRUB}" ]
then then

2
scripts/build/binary_package-lists
View File

@ -159,7 +159,7 @@ then
rm -rf chroot/binary.deb rm -rf chroot/binary.deb
# Removing depends # Removing depends
Remove_package Remove_packages
# Saving cache # Saving cache
Save_package_cache chroot Save_package_cache chroot

6
scripts/build/binary_rootfs
View File

@ -147,7 +147,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -rf chroot/chroot rm -rf chroot/chroot
# Removing depends # Removing depends
Remove_package Remove_packages
fi fi
;; ;;
@ -213,7 +213,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -rf chroot/chroot rm -rf chroot/chroot
# Removing depends # Removing depends
Remove_package Remove_packages
fi fi
;; ;;
@ -326,7 +326,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -rf chroot/chroot rm -rf chroot/chroot
# Removing depends # Removing depends
Remove_package Remove_packages
fi fi
;; ;;

2
scripts/build/binary_syslinux
View File

@ -326,7 +326,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
;; ;;
esac esac

2
scripts/build/binary_win32-loader
View File

@ -109,7 +109,7 @@ EOF
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
;; ;;
*) *)

2
scripts/build/binary_zsync
View File

@ -118,7 +118,7 @@ done
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
# Creating stage file # Creating stage file
Create_stagefile Create_stagefile

2
scripts/build/chroot_archives
View File

@ -187,7 +187,7 @@ case "${_ACTION}" in
fi fi
# Removing depends # Removing depends
Remove_package Remove_packages
else else
Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'." Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'."
fi fi

2
scripts/build/chroot_package-lists
View File

@ -88,7 +88,7 @@ done
rm -f chroot/bin/Packages rm -f chroot/bin/Packages
Remove_package Remove_packages
# Saving cache # Saving cache
Save_package_cache chroot Save_package_cache chroot

2
scripts/build/chroot_preseed
View File

@ -74,7 +74,7 @@ then
rm -f chroot/root/packages.chroot.cfg rm -f chroot/root/packages.chroot.cfg
# Remove dependency # Remove dependency
Remove_package Remove_packages
fi fi
# Creating stage file # Creating stage file

2
scripts/build/installer_debian-installer
View File

@ -829,7 +829,7 @@ fi
Save_package_cache binary Save_package_cache binary
# Removing depends # Removing depends
Remove_package Remove_packages
# Creating stage file # Creating stage file
Create_stagefile Create_stagefile

2
scripts/build/source_hdd
View File

@ -144,7 +144,7 @@ if $MAKEDEV; then
fi fi
# Removing depends # Removing depends
Remove_package Remove_packages
# Creating stage file # Creating stage file
Create_stagefile Create_stagefile

2
scripts/build/source_iso
View File

@ -112,7 +112,7 @@ mv chroot/source.iso ${LB_IMAGE_NAME}-source.iso
rm -f chroot/source.sh rm -f chroot/source.sh
# Removing depends # Removing depends
Remove_package Remove_packages
# Creating stage file # Creating stage file
Create_stagefile Create_stagefile