Don't over-insert same library code.

diff --git a/setup_scripts/_lib.sh b/setup_scripts/_lib.sh
index 832abe035a08968bf1029e1c0fbc13416f0bb2aa..61c108776376342985fbeb845bcf8cb168adde8b 100644 (file)
--- a/setup_scripts/_lib.sh
+++ b/setup_scripts/_lib.sh
@@ -1,3 +1,4 @@
 set -Ceu
 SCRIPT_NAME=$0
 cd "$(dirname "${SCRIPT_NAME}")"
+. lib/include.sh

diff --git a/setup_scripts/chrooted_command.sh b/setup_scripts/chrooted_command.sh
index a39c64cfedc5674d3d6f46d81ba55bffee555a41..0fab0ea202394b3a434a398ccc696c479336b6ef 100755 (executable)
--- a/setup_scripts/chrooted_command.sh
+++ b/setup_scripts/chrooted_command.sh
@@ -1,21 +1,21 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/NAME_LUKSVG.sh
-. lib/PATH_MNT_CHROOT.sh
-. lib/PATH_PARTITION_LUKSVG.sh
-. lib/await_path.sh
-. lib/check_openable_luksvg.sh
-. lib/check_tools.sh
-. lib/check_partition_mountable.sh
-. lib/chroot_sh.sh
-. lib/close_luksvg.sh
-. lib/mount_privately.sh
-. lib/msg.sh
-. lib/open_luksvg.sh
-. lib/path_vg.sh
-. lib/rbind_mnt.sh
-. lib/unmount_unrbind.sh
-. lib/usage.sh
+include NAME_LUKSVG
+include PATH_MNT_CHROOT
+include PATH_PARTITION_LUKSVG
+include await_path
+include check_openable_luksvg
+include check_tools
+include check_partition_mountable
+include chroot_sh
+include close_luksvg
+include mount_privately
+include msg
+include open_luksvg
+include path_vg
+include rbind_mnt
+include unmount_unrbind
+include usage
 
 # inputs to confirm
 usage $# "root-name" "command"

diff --git a/setup_scripts/install_debian.sh b/setup_scripts/install_debian.sh
index fdd8f5741d6637f489ec9fc9b4a5f221027b515a..e1fa41ac684535da83871e56602cc8f3dc3138d3 100755 (executable)
--- a/setup_scripts/install_debian.sh
+++ b/setup_scripts/install_debian.sh
@@ -1,41 +1,41 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/DIRNAME_REPO.sh
-. lib/DIRNAME_SCRIPTS.sh
-. lib/FNAME_INITRD.sh
-. lib/FNAME_PROFILE.sh
-. lib/FNAME_VMLINUZ.sh
-. lib/IDX_PARTITION_EFI.sh
-. lib/NAME_DATA.sh
-. lib/NAME_LUKSVG.sh
-. lib/NAME_SWAP.sh
-. lib/PATH_BOOT_DEVICE.sh
-. lib/PATH_DATA.sh
-. lib/PATH_EFI.sh
-. lib/PATH_FIRST_BOOT_PENDING.sh
-. lib/PATH_HOME_ROOT.sh
-. lib/PATH_MNT_CHROOT.sh
-. lib/PATH_PARTITION_LUKSVG.sh
-. lib/await_path.sh
-. lib/check_boot_device_layout.sh
-. lib/check_partition_mountable.sh
-. lib/close_luksvg.sh
-. lib/check_openable_luksvg.sh
-. lib/check_tools.sh
-. lib/chroot_sh.sh
-. lib/create_lv.sh
-. lib/disable_apt_recommends.sh
-. lib/efi_copy_kernel_vmlinuz.sh
-. lib/error.sh
-. lib/msg.sh
-. lib/open_luksvg.sh
-. lib/mount_privately.sh
-. lib/path_vg.sh
-. lib/render_template.sh
-. lib/rbind_mnt.sh
-. lib/retry_until_success.sh
-. lib/unmount_unrbind.sh
-. lib/usage.sh
+include DIRNAME_REPO
+include DIRNAME_SCRIPTS
+include FNAME_INITRD
+include FNAME_PROFILE
+include FNAME_VMLINUZ
+include IDX_PARTITION_EFI
+include NAME_DATA
+include NAME_LUKSVG
+include NAME_SWAP
+include PATH_BOOT_DEVICE
+include PATH_DATA
+include PATH_EFI
+include PATH_FIRST_BOOT_PENDING
+include PATH_HOME_ROOT
+include PATH_MNT_CHROOT
+include PATH_PARTITION_LUKSVG
+include await_path
+include check_boot_device_layout
+include check_partition_mountable
+include close_luksvg
+include check_openable_luksvg
+include check_tools
+include chroot_sh
+include create_lv
+include disable_apt_recommends
+include efi_copy_kernel_vmlinuz
+include error
+include msg
+include open_luksvg
+include mount_privately
+include path_vg
+include render_template
+include rbind_mnt
+include retry_until_success
+include unmount_unrbind
+include usage
 
 # constants unlikely to change
 FNAME_NM_CONN=wifi.nmconnection

diff --git a/setup_scripts/install_server.sh b/setup_scripts/install_server.sh
index b5b50a9bd3071acefded379988cd2b4a1b34b0ac..94e16c8f5339757814296bb71e4141405d069304 100755 (executable)
--- a/setup_scripts/install_server.sh
+++ b/setup_scripts/install_server.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/DIRNAME_REPO.sh
-. lib/DIRNAME_SCRIPTS.sh
-. lib/PATH_MY_SSH.sh
-. lib/PATH_REPO.sh
-. lib/check_tools.sh
-. lib/msg.sh
-. lib/usage.sh
+include DIRNAME_REPO
+include DIRNAME_SCRIPTS
+include PATH_MY_SSH
+include PATH_REPO
+include check_tools
+include msg
+include usage
 
 # constants we might want to change at some point
 FNAME_REPO_TAR=repo.tar

diff --git a/setup_scripts/lib/DIRNAME_REPO.sh b/setup_scripts/lib/DIRNAME_REPO.sh
index 5da52f759f4c0e0445768ddbc10e2397a2f18889..5e0c7a4a434c81d884ad78331f3ba420fdce9de9 100644 (file)
--- a/setup_scripts/lib/DIRNAME_REPO.sh
+++ b/setup_scripts/lib/DIRNAME_REPO.sh
@@ -1,4 +1,4 @@
-. lib/PATH_REPO.sh
+include PATH_REPO
 
 DIRNAME_REPO=$(basename "${PATH_REPO}")
 

diff --git a/setup_scripts/lib/PATH_BOOT_DEVICE.sh b/setup_scripts/lib/PATH_BOOT_DEVICE.sh
index c8d8e0bd72659338a5b24987cffb89f02d8e4ee1..cf77bcb50ecff9c766b87718a21399d08daba3cc 100644 (file)
--- a/setup_scripts/lib/PATH_BOOT_DEVICE.sh
+++ b/setup_scripts/lib/PATH_BOOT_DEVICE.sh
@@ -1,3 +1,3 @@
-. lib/PATH_DEV.sh
+include PATH_DEV
 
 PATH_BOOT_DEVICE="${PATH_DEV}/nvme0n1"

diff --git a/setup_scripts/lib/PATH_DATA.sh b/setup_scripts/lib/PATH_DATA.sh
index 7c103860a2ce531b2da3edff41ca636a41da5d07..ea1b272739ab4f1010e5d8d128f96498bc32ab66 100644 (file)
--- a/setup_scripts/lib/PATH_DATA.sh
+++ b/setup_scripts/lib/PATH_DATA.sh
@@ -1,4 +1,4 @@
-. lib/NAME_DATA.sh
+include NAME_DATA
 
 PATH_DATA="/${NAME_DATA}"
 

diff --git a/setup_scripts/lib/PATH_DEV.sh b/setup_scripts/lib/PATH_DEV.sh
index d27ecf14440e64222f1f3f3ce8f3685ed1d2d71b..687cab638526fcf669217d4006ffb9df1a885f28 100644 (file)
--- a/setup_scripts/lib/PATH_DEV.sh
+++ b/setup_scripts/lib/PATH_DEV.sh
@@ -1,4 +1,4 @@
-. lib/DIRNAME_DEV.sh
+include DIRNAME_DEV
 
 PATH_DEV="/${DIRNAME_DEV}"
 

diff --git a/setup_scripts/lib/PATH_FIRST_BOOT_PENDING.sh b/setup_scripts/lib/PATH_FIRST_BOOT_PENDING.sh
index 4cbe708521b9ed4208427a7bfaa0c316640ae165..cab76191803b81bb2f5d5ce6d0f1810c944f5532 100644 (file)
--- a/setup_scripts/lib/PATH_FIRST_BOOT_PENDING.sh
+++ b/setup_scripts/lib/PATH_FIRST_BOOT_PENDING.sh
@@ -1,4 +1,4 @@
-. lib/PATH_HOME_ROOT.sh
+include PATH_HOME_ROOT
 
 PATH_FIRST_BOOT_PENDING="${PATH_HOME_ROOT}/.first-boot-pending"
 

diff --git a/setup_scripts/lib/PATH_MNT_CHROOT.sh b/setup_scripts/lib/PATH_MNT_CHROOT.sh
index cc3ae8bf5a75bc7638595cddb7702e8ad4fb8455..1487abe41d2345c94bff85ea4544fe0c2e7947ea 100644 (file)
--- a/setup_scripts/lib/PATH_MNT_CHROOT.sh
+++ b/setup_scripts/lib/PATH_MNT_CHROOT.sh
@@ -1,3 +1,3 @@
-. lib/PATH_MNT.sh
+include PATH_MNT
 
 PATH_MNT_CHROOT="${PATH_MNT}/chroot"

diff --git a/setup_scripts/lib/PATH_MY_SSH.sh b/setup_scripts/lib/PATH_MY_SSH.sh
index cab8fdc6c7047837a4f5ac940c9e825e8620edb9..19789fc9cff9866bd61f903e191612097d4b3d50 100644 (file)
--- a/setup_scripts/lib/PATH_MY_SSH.sh
+++ b/setup_scripts/lib/PATH_MY_SSH.sh
@@ -1,4 +1,4 @@
-. lib/DIRNAME_SSH.sh
+include DIRNAME_SSH
 
 PATH_MY_SSH="${HOME}/${DIRNAME_SSH}"
 

diff --git a/setup_scripts/lib/PATH_PARTITION_EFI.sh b/setup_scripts/lib/PATH_PARTITION_EFI.sh
index 17f2184b2e29f4092d3c3c26bb3c7969e5a95866..c282e22e5511b9c28b1b46c67b84fed7ee37cc32 100644 (file)
--- a/setup_scripts/lib/PATH_PARTITION_EFI.sh
+++ b/setup_scripts/lib/PATH_PARTITION_EFI.sh
@@ -1,4 +1,4 @@
-. lib/IDX_PARTITION_EFI.sh
-. lib/PATH_BOOT_DEVICE.sh
+include IDX_PARTITION_EFI
+include PATH_BOOT_DEVICE
 
 PATH_PARTITION_EFI="${PATH_BOOT_DEVICE}p${IDX_PARTITION_EFI}"

diff --git a/setup_scripts/lib/PATH_PARTITION_LUKSVG.sh b/setup_scripts/lib/PATH_PARTITION_LUKSVG.sh
index df5e133cc292afc304d9cd2ce5cdb1cdd7855c82..dad6fb835a8aa78ce55b5c9d6743a98c6aaca2d8 100644 (file)
--- a/setup_scripts/lib/PATH_PARTITION_LUKSVG.sh
+++ b/setup_scripts/lib/PATH_PARTITION_LUKSVG.sh
@@ -1,4 +1,4 @@
-. lib/PATH_BOOT_DEVICE.sh
+include PATH_BOOT_DEVICE
 
 PATH_PARTITION_LUKSVG="${PATH_BOOT_DEVICE}p3"
 

diff --git a/setup_scripts/lib/TO_RBIND.sh b/setup_scripts/lib/TO_RBIND.sh
index 345845bb4325eb3ecaa572e4b7518764b86ccc7f..c07eb327cd08fd089fb453007d5f5837d65f1909 100644 (file)
--- a/setup_scripts/lib/TO_RBIND.sh
+++ b/setup_scripts/lib/TO_RBIND.sh
@@ -1,4 +1,4 @@
-. lib/DIRNAME_DEV.sh
+include DIRNAME_DEV
 
 TO_RBIND="${DIRNAME_DEV} proc sys"
 

diff --git a/setup_scripts/lib/augment_profile.sh b/setup_scripts/lib/augment_profile.sh
index 35c205ce95f78952b0299eaa050b03fe6c757379..d79f767ab48862158e8b8d512edeb164b6ac5535 100644 (file)
--- a/setup_scripts/lib/augment_profile.sh
+++ b/setup_scripts/lib/augment_profile.sh
@@ -1,5 +1,5 @@
-. lib/FNAME_PROFILE.sh
-. lib/msg.sh
+include FNAME_PROFILE
+include msg
 
 augment_profile() {
     local ALIAS_LS='alias ls="ls --color=auto"'

diff --git a/setup_scripts/lib/await_path.sh b/setup_scripts/lib/await_path.sh
index fb594fd7704db598a6fca9bbac98ad79b85707a2..9009ca4ed6752337e801112c17d46856043ed000 100644 (file)
--- a/setup_scripts/lib/await_path.sh
+++ b/setup_scripts/lib/await_path.sh
@@ -1,4 +1,4 @@
-. lib/msg.sh
+include msg
 
 await_path() {
     local TO_AWAIT=$1

diff --git a/setup_scripts/lib/check_boot_device_layout.sh b/setup_scripts/lib/check_boot_device_layout.sh
index 0b0f7bd2a419887ca2e56b43c4b235d82056f7c1..471a917fad720b42f66847d4421546a3dd5ddd0a 100644 (file)
--- a/setup_scripts/lib/check_boot_device_layout.sh
+++ b/setup_scripts/lib/check_boot_device_layout.sh
@@ -1,9 +1,9 @@
-. lib/PATH_BOOT_DEVICE.sh
-. lib/PATH_DEV.sh
-. lib/PATH_EFI.sh
-. lib/PATH_PARTITION_EFI.sh
-. lib/error.sh
-. lib/try_quiet.sh
+include PATH_BOOT_DEVICE
+include PATH_DEV
+include PATH_EFI
+include PATH_PARTITION_EFI
+include error
+include try_quiet
 
 check_boot_device_layout() {
     local COUNT_NVME

diff --git a/setup_scripts/lib/check_new_luksvg.sh b/setup_scripts/lib/check_new_luksvg.sh
index b1aa3c2dbc5067da9ccb625faaeb2142c9ed15b8..360078e1698672dc355811640bfb29ef26c3a5bd 100644 (file)
--- a/setup_scripts/lib/check_new_luksvg.sh
+++ b/setup_scripts/lib/check_new_luksvg.sh
@@ -1,10 +1,11 @@
-. lib/NAME_LUKSVG.sh
-. lib/error.sh
-. lib/try_quiet.sh
+include NAME_LUKSVG
+include error
+include path_luks_mapper
+include try_quiet
 
 check_new_luksvg() {
     local PATH_LUKS_MAPPER
-    PATH_LUKS_MAPPER="${PATH_DEV}/mapper/${NAME_LUKSVG}"
+    PATH_LUKS_MAPPER=$(path_luks_mapper "${NAME_LUKSVG}")
     try_quiet vgs "${NAME_LUKSVG}"\
         && error "volume group '${NAME_LUKSVG}' already exists"
     [ -e "${PATH_LUKS_MAPPER}" ]\

diff --git a/setup_scripts/lib/check_openable_luksvg.sh b/setup_scripts/lib/check_openable_luksvg.sh
index 42383a1deee16959bbaab142f85ffc06519f0b6d..86beba5dc4352d7e8baa321fb9ffe06300e5cf28 100644 (file)
--- a/setup_scripts/lib/check_openable_luksvg.sh
+++ b/setup_scripts/lib/check_openable_luksvg.sh
@@ -1,7 +1,7 @@
-. lib/PATH_PARTITION_LUKSVG.sh
-. lib/check_new_luksvg.sh
-. lib/error.sh
-. lib/try_quiet.sh
+include PATH_PARTITION_LUKSVG
+include check_new_luksvg
+include error
+include try_quiet
 
 check_openable_luksvg() {
     check_new_luksvg

diff --git a/setup_scripts/lib/check_partition_mountable.sh b/setup_scripts/lib/check_partition_mountable.sh
index e0a71faf61cf35165b3d4e0e424a9d8817a3e90b..aba728283ecb6e9178ebe5d1ae96e077d49c1472 100644 (file)
--- a/setup_scripts/lib/check_partition_mountable.sh
+++ b/setup_scripts/lib/check_partition_mountable.sh
@@ -1,5 +1,5 @@
-. lib/error.sh
-. lib/try_quiet.sh
+include error
+include try_quiet
 
 check_partition_mountable() {
     local PARTITION=$1

diff --git a/setup_scripts/lib/check_tools.sh b/setup_scripts/lib/check_tools.sh
index 66c453c4cd104cac0cc0036b88f89e11354bf990..44deb5069a903c26a3a9b3ee3a30dd5927c42072 100644 (file)
--- a/setup_scripts/lib/check_tools.sh
+++ b/setup_scripts/lib/check_tools.sh
@@ -1,5 +1,5 @@
-. lib/error.sh
-. lib/try_quiet.sh
+include error
+include try_quiet
 
 check_tools() {
     for CMD in "$@"; do

diff --git a/setup_scripts/lib/chroot_sh.sh b/setup_scripts/lib/chroot_sh.sh
index c9063acac837e92e56318be2a6e273404545dfcd..48516ca05b30c4a549c2e5024dc80e77aa848031 100644 (file)
--- a/setup_scripts/lib/chroot_sh.sh
+++ b/setup_scripts/lib/chroot_sh.sh
@@ -1,4 +1,4 @@
-. lib/PATH_MNT_CHROOT.sh
+include PATH_MNT_CHROOT
 
 chroot_sh() {
     LANG=C.UTF-8 chroot "${PATH_MNT_CHROOT}" /bin/sh -c "$@"

diff --git a/setup_scripts/lib/close_luksvg.sh b/setup_scripts/lib/close_luksvg.sh
index d6deae1b097db3cdbd8133c89e83bf0324f2fa70..7b1e3c0da3a489a3649e1d96213ec45b4e599166 100644 (file)
--- a/setup_scripts/lib/close_luksvg.sh
+++ b/setup_scripts/lib/close_luksvg.sh
@@ -1,5 +1,5 @@
-. lib/NAME_LUKSVG.sh
-. lib/msg.sh
+include NAME_LUKSVG
+include msg
 
 close_luksvg() {
     msg 'Deactivating volume group and closing LUKS container …'

diff --git a/setup_scripts/lib/create_lv.sh b/setup_scripts/lib/create_lv.sh
index 5e8aef5d556df4a2a8cc4a1e1b5efeff4c2f6921..26cdeaccbb217e07a0d18b3f4f29ce33020f6f0e 100644 (file)
--- a/setup_scripts/lib/create_lv.sh
+++ b/setup_scripts/lib/create_lv.sh
@@ -1,4 +1,4 @@
-. lib/msg.sh
+include msg
 
 create_lv() {
     local VG=$1

diff --git a/setup_scripts/lib/die.sh b/setup_scripts/lib/die.sh
index e27bc0f475e0317f160470ad8fd96231f7199db4..a6bb92d1ce49a31521ed82e85c0d1b3ca06bc4c3 100644 (file)
--- a/setup_scripts/lib/die.sh
+++ b/setup_scripts/lib/die.sh
@@ -1,4 +1,4 @@
-. lib/msg.sh
+include msg
 
 die() {
     msg '%s' "$*" >&2

diff --git a/setup_scripts/lib/disable_apt_recommends.sh b/setup_scripts/lib/disable_apt_recommends.sh
index 658768a71678c6918160588d08876b0337963e54..a16289ea6a9fc47805b1c66e3369350ccdc2f888 100644 (file)
--- a/setup_scripts/lib/disable_apt_recommends.sh
+++ b/setup_scripts/lib/disable_apt_recommends.sh
@@ -1,4 +1,4 @@
-. lib/msg.sh
+include msg
 
 disable_apt_recommends() {
     local PREFIX=${1:-}

diff --git a/setup_scripts/lib/efi_copy_kernel_vmlinuz.sh b/setup_scripts/lib/efi_copy_kernel_vmlinuz.sh
index 7e8d5ef7dd29e36fa7eab15739e587327bfc5f12..481d334e086deb5adbbc93bab08fba562f4b6b7c 100644 (file)
--- a/setup_scripts/lib/efi_copy_kernel_vmlinuz.sh
+++ b/setup_scripts/lib/efi_copy_kernel_vmlinuz.sh
@@ -1,6 +1,6 @@
-. lib/FNAME_INITRD.sh
-. lib/FNAME_VMLINUZ.sh
-. lib/msg.sh
+include FNAME_INITRD
+include FNAME_VMLINUZ
+include msg
 
 efi_copy_kernel_vmlinuz() {
     local PATH_EFI_NAME_BOOT=$1

diff --git a/setup_scripts/lib/error.sh b/setup_scripts/lib/error.sh
index 05726b4041bbba60d9226656d85a013790ed5332..f08f55ec92010f44d44c9b303265ed8444c86d42 100644 (file)
--- a/setup_scripts/lib/error.sh
+++ b/setup_scripts/lib/error.sh
@@ -1,4 +1,4 @@
-. lib/die.sh
+include die
 
 error() {
     die "error: $*"

diff --git a/setup_scripts/lib/include.sh b/setup_scripts/lib/include.sh
new file mode 100644 (file)
index 0000000..9bcab2d
--- /dev/null
+++ b/setup_scripts/lib/include.sh
@@ -0,0 +1,9 @@
+INCLUDED=""
+
+include() {
+    case " ${INCLUDED} " in
+        *" $1 "*) return 0 ;;
+    esac
+    INCLUDED="${INCLUDED} $1"
+    . "lib/$1.sh"
+}

diff --git a/setup_scripts/lib/mount_privately.sh b/setup_scripts/lib/mount_privately.sh
index fd37cc882536c4f9de1c07c1e1c2b33554afe185..ed4d0aa16c1bf15ef9f0a28d10b1cce46452fba9 100644 (file)
--- a/setup_scripts/lib/mount_privately.sh
+++ b/setup_scripts/lib/mount_privately.sh
@@ -1,4 +1,4 @@
-. lib/msg.sh
+include msg
 
 mount_privately() {
     local TO_MOUNT=$1

diff --git a/setup_scripts/lib/msg.sh b/setup_scripts/lib/msg.sh
index a89952d514bd8d9e72354536a32db6d7da7839c1..9a8eebfc863d830d52fe32d8343db63fa326ab15 100644 (file)
--- a/setup_scripts/lib/msg.sh
+++ b/setup_scripts/lib/msg.sh
@@ -1,4 +1,4 @@
-. lib/msg_nonl.sh
+include msg_nonl
 
 msg() {
     msg_nonl "$@"

diff --git a/setup_scripts/lib/open_luksvg.sh b/setup_scripts/lib/open_luksvg.sh
index 9335810d9c06bf9e801e896f36e31d83587898e5..486dd8493842eb7a3d15e13fc41eeae43b21b4c4 100644 (file)
--- a/setup_scripts/lib/open_luksvg.sh
+++ b/setup_scripts/lib/open_luksvg.sh
@@ -1,6 +1,6 @@
-. lib/NAME_LUKSVG.sh
-. lib/PATH_PARTITION_LUKSVG.sh
-. lib/msg.sh
+include NAME_LUKSVG
+include PATH_PARTITION_LUKSVG
+include msg
 
 open_luksvg() {
     msg 'Opening LUKS container as "%s" …' "${NAME_LUKSVG}"

diff --git a/setup_scripts/lib/path_vg.sh b/setup_scripts/lib/path_vg.sh
index 6b62b489e833c5d8d7c6c0a3b825e3e0a7d2e6db..5cf6296224ce823c90ad23135270239cd7bab7c4 100644 (file)
--- a/setup_scripts/lib/path_vg.sh
+++ b/setup_scripts/lib/path_vg.sh
@@ -1,4 +1,4 @@
-. lib/PATH_DEV.sh
+include PATH_DEV
 
 path_vg() {
     printf '%s/%s' "${PATH_DEV}" "$1"

diff --git a/setup_scripts/lib/rbind_mnt.sh b/setup_scripts/lib/rbind_mnt.sh
index 5018b6279303c91d8c0bdaf9310b3c1efb816882..4df7a2bcc5356469822c6c733a489f71171abfd9 100644 (file)
--- a/setup_scripts/lib/rbind_mnt.sh
+++ b/setup_scripts/lib/rbind_mnt.sh
@@ -1,6 +1,6 @@
-. lib/PATH_MNT_CHROOT.sh
-. lib/TO_RBIND.sh
-. lib/msg.sh
+include PATH_MNT_CHROOT
+include TO_RBIND
+include msg
 
 rbind_mnt() {
     for NAME in ${TO_RBIND}; do

diff --git a/setup_scripts/lib/render_template.sh b/setup_scripts/lib/render_template.sh
index 8b6d452555369721345be0c15bad3417e6dad3f7..ff5abf2077cdec94cb74420993144e55db7ad588 100644 (file)
--- a/setup_scripts/lib/render_template.sh
+++ b/setup_scripts/lib/render_template.sh
@@ -1,4 +1,4 @@
-. lib/PATH_REPO.sh
+include PATH_REPO
 
 render_template() {
     local PATH_TEMPLATE="${PATH_REPO}/templates/$1"

diff --git a/setup_scripts/lib/retry_until_success.sh b/setup_scripts/lib/retry_until_success.sh
index 7e87bef7e1e925be60bbf4c4af9b63f13f944e57..0aafe0b390509b9132d08ccc2d719f1018583913 100644 (file)
--- a/setup_scripts/lib/retry_until_success.sh
+++ b/setup_scripts/lib/retry_until_success.sh
@@ -1,4 +1,4 @@
-. lib/msg.sh
+include msg
 
 retry_until_success() {
     until "$@"; do

diff --git a/setup_scripts/lib/start_root.sh b/setup_scripts/lib/start_root.sh
index 5b7d970ad3160057310a19e281b644f231a908fd..b9ee5299153a7cc2b1e8715ce9aa7ec3682d1297 100644 (file)
--- a/setup_scripts/lib/start_root.sh
+++ b/setup_scripts/lib/start_root.sh
@@ -1,10 +1,10 @@
-. lib/DIRNAME_SCRIPTS.sh
-. lib/PATH_REPO.sh
-. lib/USERNAME.sh
-. lib/augment_profile.sh
-. lib/msg.sh
-. lib/retry_until_success.sh
-. lib/try_quiet.sh
+include DIRNAME_SCRIPTS
+include PATH_REPO
+include USERNAME
+include augment_profile
+include msg
+include retry_until_success
+include try_quiet
 
 start_root() {
     local PATH_TO_INSTALL="${PATH_REPO}/to_install/$1"

diff --git a/setup_scripts/lib/unmount_unrbind.sh b/setup_scripts/lib/unmount_unrbind.sh
index a410614e299f045fb0d78874f0741cbaa8f3fc58..865117cf5399aac0aaefac6a59364b62a4c60582 100644 (file)
--- a/setup_scripts/lib/unmount_unrbind.sh
+++ b/setup_scripts/lib/unmount_unrbind.sh
@@ -1,6 +1,6 @@
-. lib/PATH_MNT_CHROOT.sh
-. lib/TO_RBIND.sh
-. lib/msg.sh
+include PATH_MNT_CHROOT
+include TO_RBIND
+include msg
 
 unmount_unrbind() {
     msg 'Unmounting chroot environment …'

diff --git a/setup_scripts/lib/usage.sh b/setup_scripts/lib/usage.sh
index 4e8f5b6dd3727d863bc4a2243e2a00b3e0bc05c5..9be8f40c968780ab424c86f013fc675f98e62efd 100644 (file)
--- a/setup_scripts/lib/usage.sh
+++ b/setup_scripts/lib/usage.sh
@@ -1,4 +1,4 @@
-. lib/die.sh
+include die
 
 usage() {
     local COUNT_INPUTS=$1

diff --git a/setup_scripts/setup_git_mirror.sh b/setup_scripts/setup_git_mirror.sh
index 8f7b10d92a91b3e0394edc7a40defe10173fd40a..250e608e430f2cf1fb7b0491bfd81ff0e5271f70 100755 (executable)
--- a/setup_scripts/setup_git_mirror.sh
+++ b/setup_scripts/setup_git_mirror.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/DIRNAME_REPO.sh
-. lib/PATH_REPO.sh
-. lib/USERNAME.sh
-. lib/error.sh
-. lib/msg.sh
-. lib/render_template.sh
+include DIRNAME_REPO
+include PATH_REPO
+include USERNAME
+include error
+include msg
+include render_template
 
 # constants we might want to change at some point
 PATH_GIT_BASE=/srv/git

diff --git a/setup_scripts/setup_luksvg.sh b/setup_scripts/setup_luksvg.sh
index b6de9753d7beeab0bc8d14b71f8910f7753b7d7f..72e8f4de547024d9064de6fca63bc97aef837949 100755 (executable)
--- a/setup_scripts/setup_luksvg.sh
+++ b/setup_scripts/setup_luksvg.sh
@@ -1,27 +1,28 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/NAME_DATA.sh
-. lib/NAME_LUKSVG.sh
-. lib/NAME_SWAP.sh
-. lib/PATH_MNT.sh
-. lib/PATH_DATA.sh
-. lib/PATH_PARTITION_LUKSVG.sh
-. lib/PATH_REPO.sh
-. lib/check_boot_device_layout.sh
-. lib/check_partition_mountable.sh
-. lib/check_new_luksvg.sh
-. lib/check_tools.sh
-. lib/close_luksvg.sh
-. lib/create_lv.sh
-. lib/die.sh
-. lib/error.sh
-. lib/msg.sh
-. lib/msg_nonl.sh
-. lib/open_luksvg.sh
-. lib/mount_privately.sh
-. lib/path_vg.sh
-. lib/try_quiet.sh
-. lib/usage.sh
+include NAME_DATA
+include NAME_LUKSVG
+include NAME_SWAP
+include PATH_MNT
+include PATH_DATA
+include PATH_PARTITION_LUKSVG
+include PATH_REPO
+include check_boot_device_layout
+include check_partition_mountable
+include check_new_luksvg
+include check_tools
+include close_luksvg
+include create_lv
+include die
+include error
+include msg
+include msg_nonl
+include open_luksvg
+include mount_privately
+include path_luks_mapper
+include path_vg
+include try_quiet
+include usage
 
 # inputs to confirm
 usage $#

diff --git a/setup_scripts/start_root_server.sh b/setup_scripts/start_root_server.sh
index da5effe7eefaf8358fc332431b7c7fdf886cfa53..9d71357288032697e88932d23e2cc237878a70df 100755 (executable)
--- a/setup_scripts/start_root_server.sh
+++ b/setup_scripts/start_root_server.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/DIRNAME_SSH.sh
-. lib/PATH_MY_SSH.sh
-. lib/USERNAME.sh
-. lib/disable_apt_recommends.sh
-. lib/msg.sh
-. lib/retry_until_success.sh
-. lib/start_root.sh
+include DIRNAME_SSH
+include PATH_MY_SSH
+include USERNAME
+include disable_apt_recommends
+include msg
+include retry_until_success
+include start_root
 
 # constants unlikely to change
 PATH_SSHD_DROPIN=/etc/ssh/sshd_config.d/60-ssh-hardening.conf

diff --git a/setup_scripts/start_root_t490s.sh b/setup_scripts/start_root_t490s.sh
index dea9f15538d284ca530528d5114eb487fc86e594..cd39b457b3f9c62cfba921bad3f5e552bbe429a7 100755 (executable)
--- a/setup_scripts/start_root_t490s.sh
+++ b/setup_scripts/start_root_t490s.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/DIRNAME_SCRIPTS.sh
-. lib/PATH_FIRST_BOOT_PENDING.sh
-. lib/PATH_REPO.sh
-. lib/msg.sh
-. lib/start_root.sh
-. lib/render_template.sh
+include DIRNAME_SCRIPTS
+include PATH_FIRST_BOOT_PENDING
+include PATH_REPO
+include msg
+include start_root
+include render_template
 
 # constants unlikely to change
 PATH_DEFAULT_LOCALE=/etc/default/locale

diff --git a/setup_scripts/start_user.sh b/setup_scripts/start_user.sh
index fdb3f58cde5a0b361621e953ea2b89fa4fcf48e7..e7c128441372ee0ac2c57aafeee3857dd906b5d3 100755 (executable)
--- a/setup_scripts/start_user.sh
+++ b/setup_scripts/start_user.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/PATH_REPO.sh
-. lib/augment_profile.sh
-. lib/msg.sh
+include PATH_REPO
+include augment_profile
+include msg
 
 # constants we might want to change at some point
 DIRNAME_HOME_USER=home_user

diff --git a/setup_scripts/update_efi.sh b/setup_scripts/update_efi.sh
index 8ca452b340e05e0ab4151f0b72e52b96a967f378..676fea6cdb187adf0cedc45ad43d75a27b6c94d9 100755 (executable)
--- a/setup_scripts/update_efi.sh
+++ b/setup_scripts/update_efi.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-. lib/PATH_PARTITION_EFI.sh
-. lib/check_partition_mountable.sh
-. lib/efi_copy_kernel_vmlinuz.sh
-. lib/msg.sh
-. lib/usage.sh
+include PATH_PARTITION_EFI
+include check_partition_mountable
+include efi_copy_kernel_vmlinuz
+include msg
+include usage
 
 usage $#