From: Plom Heller <plom@plomlompom.com>
Date: Fri, 11 Sep 2026 03:19:29 +0000 (+0200)
Subject: Don't over-insert same library code.
X-Git-Url: https://plomlompom.com/repos/do_tasks?a=commitdiff_plain;h=8b010175cb6a6bb97df76c5dbdc58d9d32a75c87;p=confplom

Don't over-insert same library code.
---

diff --git a/setup_scripts/_lib.sh b/setup_scripts/_lib.sh
index 832abe0..61c1087 100644
--- 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 a39c64c..0fab0ea 100755
--- 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 fdd8f57..e1fa41a 100755
--- 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 b5b50a9..94e16c8 100755
--- 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 5da52f7..5e0c7a4 100644
--- 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 c8d8e0b..cf77bcb 100644
--- 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 7c10386..ea1b272 100644
--- 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 d27ecf1..687cab6 100644
--- 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 4cbe708..cab7619 100644
--- 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 cc3ae8b..1487abe 100644
--- 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 cab8fdc..19789fc 100644
--- 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 17f2184..c282e22 100644
--- 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 df5e133..dad6fb8 100644
--- 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 345845b..c07eb32 100644
--- 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 35c205c..d79f767 100644
--- 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 fb594fd..9009ca4 100644
--- 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 0b0f7bd..471a917 100644
--- 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 b1aa3c2..360078e 100644
--- 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 42383a1..86beba5 100644
--- 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 e0a71fa..aba7282 100644
--- 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 66c453c..44deb50 100644
--- 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 c9063ac..48516ca 100644
--- 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 d6deae1..7b1e3c0 100644
--- 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 5e8aef5..26cdeac 100644
--- 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 e27bc0f..a6bb92d 100644
--- 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 658768a..a16289e 100644
--- 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 7e8d5ef..481d334 100644
--- 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 05726b4..f08f55e 100644
--- 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
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 fd37cc8..ed4d0aa 100644
--- 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 a89952d..9a8eebf 100644
--- 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 9335810..486dd84 100644
--- 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 6b62b48..5cf6296 100644
--- 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 5018b62..4df7a2b 100644
--- 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 8b6d452..ff5abf2 100644
--- 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 7e87bef..0aafe0b 100644
--- 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 5b7d970..b9ee529 100644
--- 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 a410614..865117c 100644
--- 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 4e8f5b6..9be8f40 100644
--- 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 8f7b10d..250e608 100755
--- 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 b6de975..72e8f4d 100755
--- 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 da5effe..9d71357 100755
--- 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 dea9f15..cd39b45 100755
--- 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 fdb3f58..e7c1284 100755
--- 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 8ca452b..676fea6 100755
--- 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 $#