From 9c8d26c97ff51ebc105e2bcf815c29ff79eea2a6 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Tue, 5 May 2020 19:29:36 +0100
Subject: packages: avoid unnecessary nesting

Gbp-Dch: Ignore
---
 functions/packages.sh | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'functions')

diff --git a/functions/packages.sh b/functions/packages.sh
index 0044a46e4..75bbd8478 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -39,27 +39,28 @@ Check_package ()
 # Note, reads from _LB_PACKAGES
 Install_package ()
 {
-	if [ -n "${_LB_PACKAGES}" ] && [ "${LB_BUILD_WITH_CHROOT}" != "false" ]
-	then
-		# Record in file to survive failure such that recovery can take place.
-		local LIST_FILE
-		LIST_FILE="$(Installed_tmp_packages_file)"
-		local PACKAGE
-		for PACKAGE in ${_LB_PACKAGES}; do
-			echo "${PACKAGE}" >> "${LIST_FILE}"
-		done
-
-		case "${LB_APT}" in
-			apt|apt-get)
-				Chroot chroot "apt-get install -o APT::Install-Recommends=false ${APT_OPTIONS} ${_LB_PACKAGES}"
-				;;
-
-			aptitude)
-				Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LB_PACKAGES}"
-				;;
-		esac
-		unset _LB_PACKAGES # Can clear this now
+	if [ -z "${_LB_PACKAGES}" ] || [ "${LB_BUILD_WITH_CHROOT}" != "true" ]; then
+		return
 	fi
+
+	# Record in file to survive failure such that recovery can take place.
+	local LIST_FILE
+	LIST_FILE="$(Installed_tmp_packages_file)"
+	local PACKAGE
+	for PACKAGE in ${_LB_PACKAGES}; do
+		echo "${PACKAGE}" >> "${LIST_FILE}"
+	done
+
+	case "${LB_APT}" in
+		apt|apt-get)
+			Chroot chroot "apt-get install -o APT::Install-Recommends=false ${APT_OPTIONS} ${_LB_PACKAGES}"
+			;;
+
+		aptitude)
+			Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LB_PACKAGES}"
+			;;
+	esac
+	unset _LB_PACKAGES # Can clear this now
 }
 
 Remove_package ()
-- 
cgit v1.2.3