From 2ea6eeefa2a42443b716436cdbffc26c6aca3392 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sun, 15 Mar 2020 23:09:17 +0000 Subject: installer: move an exclude removal outside of loop --- scripts/build/installer_debian-installer | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'scripts/build/installer_debian-installer') diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 92a68a5da..b7d62bd8a 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -632,16 +632,13 @@ EOF # Excluding udebs from excludes because we want them to be in the image on purpose sed -i -e 's|di-utils-exit-installer||' exclude # used for live-installer-launcher + if [ "${LB_DEBIAN_INSTALLER}" = "live" ]; then + sed -i -e 's|live-installer||' exclude + fi # Remove all udebs to be excluded from inclusion - while read EXCLUDE - do - if [ "${LB_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ] - then - continue - fi - - rm -f ${EXCLUDE}_*.udeb + while read EXCLUDE; do + rm -f "${EXCLUDE}_*.udeb" done < exclude # Sort udebs into alphabetised pool structure -- cgit v1.2.3