Renaming 'packages lists' to 'package lists' all over the place.

12 files changed, 43 insertions, 43 deletions

diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 8598e3ed6..8d3e6cd6a 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -59,7 +59,7 @@ lb binary_manifest ${*}
 lb binary_encryption ${*}
 
 # Prepare images
-lb binary_local-packageslists ${*}
+lb binary_local-packagelists ${*}
 lb binary_linux-image ${*}
 lb binary_debian-installer ${*}
 lb binary_memtest ${*}
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index 50ed78100..d6b136858 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -145,7 +145,7 @@ case "${LB_BOOTLOADER}" in
 		;;
 esac
 
-if In_list "stripped minimal" "${LB_PACKAGES_LISTS}"
+if In_list "stripped minimal" "${LB_PACKAGE_LISTS}"
 then
 	if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
 	then
diff --git a/scripts/build/lb_binary_local-packageslists b/scripts/build/lb_binary_local-packagelists
index 80f3fb257..bd75628d8 100755
--- a/scripts/build/lb_binary_local-packageslists
+++ b/scripts/build/lb_binary_local-packagelists
@@ -24,13 +24,13 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-Echo_message "Begin installing local packages lists..."
+Echo_message "Begin installing local package lists..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
-Check_stagefile .stage/binary_local-packageslists
+Check_stagefile .stage/binary_local-packagelists
 
 # Checking lock file
 Check_lockfile .lock
@@ -38,7 +38,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if Find_files config/binary_local-packageslists/*.list
+if Find_files config/binary_local-packagelists/*.list
 then
 	# Restoring cache
 	Restore_cache cache/packages_chroot
@@ -53,16 +53,16 @@ then
 	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
 	touch chroot/var/lib/dpkg/status
 
-	for PACKAGESLIST in config/binary_local-packageslists/*.list
+	for PACKAGELIST in config/binary_local-packagelists/*.list
 	do
 		# Generate package list
-		Expand_packagelist "${PACKAGESLIST}" "config/binary_local-packageslists" "config/chroot_local-packageslists" > chroot/root/"$(basename ${PACKAGESLIST})"
+		Expand_packagelist "${PACKAGELIST}" "config/binary_local-packagelists" "config/chroot_local-packagelists" > chroot/root/"$(basename ${PACKAGELIST})"
 
 		# Downloading additional packages
-		Chroot chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
+		Chroot chroot "xargs --arg-file=/root/$(basename ${PACKAGELIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
 
 		# Remove package list
-		rm chroot/root/"$(basename ${PACKAGESLIST})"
+		rm chroot/root/"$(basename ${PACKAGELIST})"
 	done
 
 	for FILE in chroot/binary.deb/archives/*.deb
@@ -125,5 +125,5 @@ then
 	Save_cache cache/packages_chroot
 
 	# Creating stage file
-	Create_stagefile .stage/binary_local-packageslists
+	Create_stagefile .stage/binary_local-packagelists
 fi
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index d7724d7c4..4a46818fa 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -80,7 +80,7 @@ fi
 
 if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ]
 then
-	case "${LB_PACKAGES_LISTS}" in
+	case "${LB_PACKAGE_LISTS}" in
 		stripped|minimal)
 			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
 			;;
@@ -155,7 +155,7 @@ then
 	fi
 
 	# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
-	case "${LB_PACKAGES_LISTS}" in
+	case "${LB_PACKAGE_LISTS}" in
 		stripped|minimal)
 			Chroot chroot "dpkg -P cdebootstrap-helper-diverts"
 			;;
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index 2e68a0e48..25028889b 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -88,7 +88,7 @@ if [ "${LB_USE_FAKEROOT}" != "true" ]
 then
 	if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ]
 	then
-		if In_list "stripped minimal" "${LB_PACKAGES_LISTS}"
+		if In_list "stripped minimal" "${LB_PACKAGE_LISTS}"
 		then
 			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
 		fi
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index a5e83f044..1dff0bdd2 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -56,8 +56,8 @@ lb chroot_linux-image install ${*}
 lb chroot_preseed ${*}
 lb chroot_local-preseed ${*}
 lb chroot_tasks ${*}
-lb chroot_packageslists ${*}
-lb chroot_local-packageslists ${*}
+lb chroot_packagelists ${*}
+lb chroot_local-packagelists ${*}
 lb chroot_packages ${*}
 lb chroot_local-packages ${*}
 lb chroot_install-packages ${*}
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index ed40b18c0..7e2860cc5 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -39,7 +39,7 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Processing hooks
-HOOKS="$(echo ${LB_HOOKS} ${LB_PACKAGES_LISTS} ${LB_TASKS} | sed -e 's| |\n|g' | sort -u)"
+HOOKS="$(echo ${LB_HOOKS} ${LB_PACKAGE_LISTS} ${LB_TASKS} | sed -e 's| |\n|g' | sort -u)"
 
 for HOOK in ${HOOKS}
 do
diff --git a/scripts/build/lb_chroot_local-packageslists b/scripts/build/lb_chroot_local-packagelists
index ab7e5f20a..ea333cc11 100755
--- a/scripts/build/lb_chroot_local-packageslists
+++ b/scripts/build/lb_chroot_local-packagelists
@@ -14,7 +14,7 @@ set -e
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
 # Setting static variables
-DESCRIPTION="$(Echo 'queue install of local packages lists into chroot')"
+DESCRIPTION="$(Echo 'queue install of local package lists into chroot')"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
@@ -24,13 +24,13 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-Echo_message "Begin queueing installation of local packages lists..."
+Echo_message "Begin queueing installation of local package lists..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
-Check_stagefile .stage/chroot_local-packageslists
+Check_stagefile .stage/chroot_local-packagelists
 
 # Checking lock file
 Check_lockfile .lock
@@ -38,15 +38,15 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/chroot_local-packageslists/*.list > /dev/null 2>&1
+if ls config/chroot_local-packagelists/*.list > /dev/null 2>&1
 then
-	for LIST in config/chroot_local-packageslists/*.list
+	for LIST in config/chroot_local-packagelists/*.list
 	do
 		# Generating local package list
-		Expand_packagelist "$(basename ${LIST})" "config/chroot_local-packageslists" \
+		Expand_packagelist "$(basename ${LIST})" "config/chroot_local-packagelists" \
 			>> chroot/root/chroot_packages
 	done
 
 	# Creating stage file
-	Create_stagefile .stage/chroot_local-packageslists
+	Create_stagefile .stage/chroot_local-packagelists
 fi
diff --git a/scripts/build/lb_chroot_packageslists b/scripts/build/lb_chroot_packagelists
index bd2ba24dc..398432c0a 100755
--- a/scripts/build/lb_chroot_packageslists
+++ b/scripts/build/lb_chroot_packagelists
@@ -14,7 +14,7 @@ set -e
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
 # Setting static variables
-DESCRIPTION="$(Echo 'queue install of packages lists into chroot')"
+DESCRIPTION="$(Echo 'queue install of package lists into chroot')"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
@@ -24,13 +24,13 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-Echo_message "Begin queueing installation of packages lists..."
+Echo_message "Begin queueing installation of package lists..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
-Check_stagefile .stage/chroot_packageslists
+Check_stagefile .stage/chroot_packagelists
 
 # Checking lock file
 Check_lockfile .lock
@@ -38,15 +38,15 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ -n "${LB_PACKAGES_LISTS}" ] && [ "${LB_PACKAGES_LISTS}" != "none" ]
+if [ -n "${LB_PACKAGE_LISTS}" ] && [ "${LB_PACKAGE_LISTS}" != "none" ]
 then
 
-	for LIST in ${LB_PACKAGES_LISTS}
+	for LIST in ${LB_PACKAGE_LISTS}
 	do
 		# Generating package list
 		Expand_packagelist "${LIST}" >> chroot/root/chroot_packages
 	done
 
 	# Creating stage file
-	Create_stagefile .stage/chroot_packageslists
+	Create_stagefile .stage/chroot_packagelists
 fi
diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/lb_chroot_preseed
index 22bfe7a10..26b792275 100755
--- a/scripts/build/lb_chroot_preseed
+++ b/scripts/build/lb_chroot_preseed
@@ -39,7 +39,7 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Processing preseeds
-for PRESEED in ${LB_PACKAGES_LISTS} ${LB_TASKS}
+for PRESEED in ${LB_PACKAGE_LISTS} ${LB_TASKS}
 do
 	if [ -f ${LB_BASE:-/usr/share/live/build}/preseed/"${PRESEED}" ]
 	then
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index e073d3ac5..79e4232f5 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -238,7 +238,7 @@ EOF
 				# If we bootstrapped a minimal chroot, we need
 				# to install apt-utils before we have have
 				# completed all the indices.
-				case "${LB_PACKAGES_LISTS}" in
+				case "${LB_PACKAGE_LISTS}" in
 					stripped|minimal)
 						Chroot chroot "apt-get update"
 						;;
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 6772519a7..1b101d30f 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -111,7 +111,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--net-cow-path PATH]\n\
 \t    [--net-cow-server IP|HOSTNAME]\n\
 \t    [--net-tarball bzip2|gzip|tar|none]\n\
-\t    [-p|--packages-lists FILE]\n\
+\t    [-p|--package-lists FILE]\n\
 \t    [--packages PACKAGE|\"PACKAGES\"]\n\
 \t    [--quiet]\n\
 \t    [-r|--repositories REPOSITORY|\"REPOSITORIES\"]\n\
@@ -144,7 +144,7 @@ Local_arguments ()
 		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
 		mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
-		packages:,packages-lists:,tasks:,security:,volatile:,backports:,sysvinit:,binary-filesystem:,binary-images:,
+		packages:,package-lists:,tasks:,security:,volatile:,backports:,sysvinit:,binary-filesystem:,binary-images:,
 		apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
@@ -181,7 +181,7 @@ Local_arguments ()
 				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 
 				# Dump contents of directories that contain text files
-				for DIRECTORY in config/binary_local-packageslists config/chroot_local-packageslists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
+				for DIRECTORY in config/binary_local-packagelists config/chroot_local-packagelists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
 				do
 					if Find_files "${DIRECTORY}"
 					then
@@ -499,8 +499,8 @@ Local_arguments ()
 				shift 2
 				;;
 
-			-p|--packages-lists)
-				LB_PACKAGES_LISTS="${2}"
+			-p|--package-lists)
+				LB_PACKAGE_LISTS="${2}"
 				shift 2
 				;;
 
@@ -1029,7 +1029,7 @@ mkdir -p config/chroot_local-hooks
 mkdir -p config/chroot_local-includes
 mkdir -p config/chroot_local-patches
 mkdir -p config/chroot_local-packages
-mkdir -p config/chroot_local-packageslists
+mkdir -p config/chroot_local-packagelists
 mkdir -p config/chroot_local-preseed
 mkdir -p config/chroot_sources
 
@@ -1084,9 +1084,9 @@ LB_REPOSITORIES="${LB_REPOSITORIES}"
 # (Default: empty)
 LB_PACKAGES="${LB_PACKAGES}"
 
-# \$LB_PACKAGES_LISTS: set package list to install
-# (Default: ${LB_PACKAGES_LISTS})
-LB_PACKAGES_LISTS="${LB_PACKAGES_LISTS}"
+# \$LB_PACKAGE_LISTS: set package list to install
+# (Default: ${LB_PACKAGE_LISTS})
+LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS}"
 
 # \$LB_TASKS: set tasks to install
 # (Default: empty)
@@ -1116,7 +1116,7 @@ mkdir -p config/binary_grub
 mkdir -p config/binary_local-debs
 mkdir -p config/binary_local-hooks
 mkdir -p config/binary_local-includes
-mkdir -p config/binary_local-packageslists
+mkdir -p config/binary_local-packagelists
 mkdir -p config/binary_local-udebs
 mkdir -p config/binary_rootfs
 mkdir -p config/binary_syslinux
@@ -1277,8 +1277,8 @@ mkdir -p auto/scripts
 if [ "${CONFIG}" = "clone" ] # FIXME
 then
 	# Read package selection
-	echo $(dpkg --get-selections | awk '{ print $1 }') > config/chroot_local-packageslists/local-system
-	LB_PACKAGES_LISTS="${LB_PACKAGES_LISTS} local-system"
+	echo $(dpkg --get-selections | awk '{ print $1 }') > config/chroot_local-packagelists/local-system
+	LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS} local-system"
 
 	# Read debconf questions
 	if [ ! -f /usr/bin/debconf-get-selections ]