rename LB_ARCHITECTURES to LB_ARCHITECTURE

this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1
to keep the renaming simple, but leaving the variable plural is a cause
for confusion.

since this property is stored in the INI style config/build config file
rather than a shell script based one, at the property there is already
singular, there was no need for a backwards compatibility hack.

Gbp-Dch: Short

4 files changed, 15 insertions, 15 deletions

diff --git a/functions/architectures.sh b/functions/architectures.sh
index 3f9ccc527..91c1b42cc 100755
--- a/functions/architectures.sh
+++ b/functions/architectures.sh
@@ -18,7 +18,7 @@ Check_architectures ()
 	local ARCHITECTURE
 	for ARCHITECTURE in ${ARCHITECTURES}
 	do
-		if [ "$(echo ${LB_ARCHITECTURES} | grep ${ARCHITECTURE})" ]
+		if [ "$(echo ${LB_ARCHITECTURE} | grep ${ARCHITECTURE})" ]
 		then
 			VALID=true
 			break
@@ -75,7 +75,7 @@ Check_crossarchitectures ()
 			;;
 	esac
 
-	if [ "${LB_ARCHITECTURES}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]
+	if [ "${LB_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]
 	then
 
 		if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ]
diff --git a/functions/conffile.sh b/functions/conffile.sh
index f6a68b154..aab3fdc8d 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -18,7 +18,7 @@ Get_conffiles ()
 	else
 		local FILE
 		for FILE in "${@}"; do
-			FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURES} ${FILE}.${DISTRIBUTION}"
+			FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURE} ${FILE}.${DISTRIBUTION}"
 			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')"
 			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}"
 			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}"
diff --git a/functions/configuration.sh b/functions/configuration.sh
index 5c226d4d3..8e484aeb5 100755
--- a/functions/configuration.sh
+++ b/functions/configuration.sh
@@ -43,9 +43,9 @@ New_configuration ()
 	export LIVE_IMAGE_NAME
 
 	# (FIXME: Support and default to 'any')
-	LB_ARCHITECTURES="${LB_ARCHITECTURES:-$(Get_configuration config/build Architecture)}"
-	LB_ARCHITECTURES="${LB_ARCHITECTURES:-${CURRENT_IMAGE_ARCHITECTURE}}"
-	export LB_ARCHITECTURES
+	LB_ARCHITECTURE="${LB_ARCHITECTURE:-$(Get_configuration config/build Architecture)}"
+	LB_ARCHITECTURE="${LB_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}"
+	export LB_ARCHITECTURE
 
 	LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}"
 	LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
@@ -182,7 +182,7 @@ Prepare_config ()
 			;;
 	esac
 
-	if [ "${LB_ARCHITECTURES}" = "i386" ] && [ "${CURRENT_IMAGE_ARCHITECTURE}" = "amd64" ]
+	if [ "${LB_ARCHITECTURE}" = "i386" ] && [ "${CURRENT_IMAGE_ARCHITECTURE}" = "amd64" ]
 	then
 		# Use linux32 when building amd64 images on i386
 		_LINUX32="linux32"
@@ -228,7 +228,7 @@ Prepare_config ()
 	if [ -n "${LB_LINUX_FLAVOURS}" ]; then
 		LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS}"
 	fi
-	case "${LB_ARCHITECTURES}" in
+	case "${LB_ARCHITECTURE}" in
 		arm64)
 			LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH:-arm64}"
 			;;
@@ -266,7 +266,7 @@ Prepare_config ()
 			;;
 
 		*)
-			Echo_error "Architecture(s) ${LB_ARCHITECTURES} not yet supported (FIXME)"
+			Echo_error "Architecture(s) ${LB_ARCHITECTURE} not yet supported (FIXME)"
 			exit 1
 			;;
 	esac
@@ -302,7 +302,7 @@ Prepare_config ()
 			;;
 	esac
 
-	case "${LB_ARCHITECTURES}" in
+	case "${LB_ARCHITECTURE}" in
 		amd64|i386)
 			LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}"
 			;;
@@ -314,7 +314,7 @@ Prepare_config ()
 
 	if [ -z "${LB_BOOTLOADERS}" ]
 	then
-		case "${LB_ARCHITECTURES}" in
+		case "${LB_ARCHITECTURE}" in
 			amd64|i386)
 				case "${LIVE_IMAGE_TYPE}" in
 					hdd|netboot)
@@ -431,7 +431,7 @@ Prepare_config ()
 		Echo_warning "A value of 'false' for option LB_MEMTEST is deprecated, please use 'none' in future."
 	fi
 
-	case "${LB_ARCHITECTURES}" in
+	case "${LB_ARCHITECTURE}" in
 		amd64|i386)
 			if [ "${LB_DEBIAN_INSTALLER}" != "none" ]; then
 				LB_LOADLIN="${LB_LOADLIN:-true}"
@@ -445,7 +445,7 @@ Prepare_config ()
 			;;
 	esac
 
-	case "${LB_ARCHITECTURES}" in
+	case "${LB_ARCHITECTURE}" in
 		amd64|i386)
 			if [ "${LB_DEBIAN_INSTALLER}" != "none" ]; then
 				LB_WIN32_LOADER="${LB_WIN32_LOADER:-true}"
diff --git a/functions/firmwarelists.sh b/functions/firmwarelists.sh
index 345752de4..0540d0051 100755
--- a/functions/firmwarelists.sh
+++ b/functions/firmwarelists.sh
@@ -22,9 +22,9 @@ Firmware_List_From_Contents () {
 	local _ARCHIVE_AREA
 	for _ARCHIVE_AREA in ${ARCHIVE_AREAS}
 	do
-		local CONTENTS_URL="${MIRROR_CHROOT}/dists/${DISTRO_CHROOT}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz"
+		local CONTENTS_URL="${MIRROR_CHROOT}/dists/${DISTRO_CHROOT}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURE}.gz"
 		local CONTENTS_FILEDIR="cache/contents.chroot/${DISTRO_CHROOT}/${_ARCHIVE_AREA}"
-		local CONTENTS_FILE="${CONTENTS_FILEDIR}/contents-${LB_ARCHITECTURES}.gz"
+		local CONTENTS_FILE="${CONTENTS_FILEDIR}/contents-${LB_ARCHITECTURE}.gz"
 
 		mkdir -p "${CONTENTS_FILEDIR}"