Minor refactoring.

diff --git a/scripts/install_debian.sh b/scripts/install_debian.sh
index 074ff87aaf25e729702653409e094bb61d8673f1..adb8e4592fb56858f003c4b6499a489bc358fdb1 100755 (executable)
--- a/scripts/install_debian.sh
+++ b/scripts/install_debian.sh
@@ -12,6 +12,7 @@ include NAME_SWAP
 include PATH_BOOT_DEVICE
 include PATH_DATA
 include PATH_EFI
+include PATH_ETC_APT
 include PATH_FIRST_BOOT_PENDING
 include PATH_HOME_ROOT
 include PATH_MNT_CHROOT
@@ -59,8 +60,9 @@ NAME_ROOT="${NAME_BOOT}"
 
 # constants derived from changeables
 PATH_EFI_NAME_BOOT="${PATH_EFI}/${NAME_BOOT}"
-PATH_FIRST_BOOT_SCRIPT="${PATH_DATA}/${DIRNAME_REPO}/${DIRNAME_SCRIPTS}/${FNAME_SCRIPT_START}"
-PATH_MNT_APT_SOURCES="${PATH_MNT_CHROOT}/etc/apt/sources.list"
+PATH_FIRST_BOOT_SCRIPT=\
+"${PATH_DATA}/${DIRNAME_REPO}/${DIRNAME_SCRIPTS}/${FNAME_SCRIPT_START}"
+PATH_MNT_APT_SOURCES="${PATH_MNT_CHROOT}${PATH_ETC_APT}/sources.list"
 PATH_MNT_CRYPTTAB="${PATH_MNT_CHROOT}${PATH_CRYPTTAB}"
 PATH_MNT_FIRST_BOOT_PENDING="${PATH_MNT_CHROOT}${PATH_FIRST_BOOT_PENDING}"
 PATH_MNT_FSTAB="${PATH_MNT_CHROOT}${PATH_FSTAB}"

diff --git a/scripts/lib/PATH_ETC_APT b/scripts/lib/PATH_ETC_APT
new file mode 100644 (file)
index 0000000..33f37ae
--- /dev/null
+++ b/scripts/lib/PATH_ETC_APT
@@ -0,0 +1 @@
+PATH_ETC_APT=/etc/apt

diff --git a/scripts/lib/disable_apt_recommends.sh b/scripts/lib/disable_apt_recommends.sh
index a16289ea6a9fc47805b1c66e3369350ccdc2f888..f553e7af8bdd6f3e009d02c2ae123555ba06a70d 100644 (file)
--- a/scripts/lib/disable_apt_recommends.sh
+++ b/scripts/lib/disable_apt_recommends.sh
@@ -1,8 +1,9 @@
+include PATH_ETC_APT
 include msg
 
 disable_apt_recommends() {
     local PREFIX=${1:-}
-    local TARGET="${PREFIX}/etc/apt/apt.conf.d/90-no-recommends"
+    local TARGET="${PREFIX}${PATH_ETC_APT}/apt.conf.d/90-no-recommends"
     msg 'Disabling automatic installation of APT recommends …'
     printf 'APT::Install-Recommends "false";\n' >| "${TARGET}"
 }