From 218736f377419fb9c54543a4eefd99212c10d3ff Mon Sep 17 00:00:00 2001 From: Plom Heller Date: Mon, 7 Sep 2026 05:00:06 +0200 Subject: [PATCH] Declutter top directory. --- _lib.sh => setup_scripts/_lib.sh | 1 + chrooted_command.sh => setup_scripts/chrooted_command.sh | 0 install_debian.sh => setup_scripts/install_debian.sh | 0 setup_luksvg.sh => setup_scripts/setup_luksvg.sh | 2 +- start_root.sh => setup_scripts/start_root.sh | 7 +++++-- start_user.sh => setup_scripts/start_user.sh | 2 +- 90-backlight.rules => to_copy/90-backlight.rules | 0 7 files changed, 8 insertions(+), 4 deletions(-) rename _lib.sh => setup_scripts/_lib.sh (99%) rename chrooted_command.sh => setup_scripts/chrooted_command.sh (100%) rename install_debian.sh => setup_scripts/install_debian.sh (100%) rename setup_luksvg.sh => setup_scripts/setup_luksvg.sh (97%) rename start_root.sh => setup_scripts/start_root.sh (88%) rename start_user.sh => setup_scripts/start_user.sh (86%) rename 90-backlight.rules => to_copy/90-backlight.rules (100%) diff --git a/_lib.sh b/setup_scripts/_lib.sh similarity index 99% rename from _lib.sh rename to setup_scripts/_lib.sh index a4759dc..149f046 100644 --- a/_lib.sh +++ b/setup_scripts/_lib.sh @@ -17,6 +17,7 @@ PATH_MNT_ROOT="${PATH_MNT}/root" # constants derived from changeables PATH_PROFILE="${HOME}/${FNAME_PROFILE}" +PATH_REPO=$(cd .. && pwd) # path constructors path_luks_mapper() { diff --git a/chrooted_command.sh b/setup_scripts/chrooted_command.sh similarity index 100% rename from chrooted_command.sh rename to setup_scripts/chrooted_command.sh diff --git a/install_debian.sh b/setup_scripts/install_debian.sh similarity index 100% rename from install_debian.sh rename to setup_scripts/install_debian.sh diff --git a/setup_luksvg.sh b/setup_scripts/setup_luksvg.sh similarity index 97% rename from setup_luksvg.sh rename to setup_scripts/setup_luksvg.sh index fcaeabf..3cbc508 100755 --- a/setup_luksvg.sh +++ b/setup_scripts/setup_luksvg.sh @@ -43,7 +43,7 @@ mkfs.ext4 -q "${PATH_VG_DATA}" # place repo copy mount_privately "${PATH_VG_DATA}" "${PATH_MNT_DATA}" msg 'Copying repo …' -cp -a "$(pwd)" "${PATH_MNT_DATA}" +cp -a "${PATH_REPO}" "${PATH_MNT_DATA}" # clean-up msg 'Unmounting …' diff --git a/start_root.sh b/setup_scripts/start_root.sh similarity index 88% rename from start_root.sh rename to setup_scripts/start_root.sh index 5e00f2e..75d529f 100755 --- a/start_root.sh +++ b/setup_scripts/start_root.sh @@ -16,6 +16,9 @@ PRINTK_LEVELS="4 4 1 7" TLP_THRESH_START=40 TLP_THRESH_STOP=80 +# constants derived from changeables +PATH_TO_COPY="${PATH_REPO}/to_copy" + augment_profile msg 'Ensuring packages: %s' "${TO_INSTALL}" @@ -39,8 +42,8 @@ printf 'START_CHARGE_THRESH_BAT0=%s\nSTOP_CHARGE_THRESH_BAT0=%s\n' \ "${TLP_THRESH_START}" "${TLP_THRESH_STOP}" >| "${PATH_TLP_THRESH_CONF}" tlp start -msg 'Making backlight devices available to user-run backlight.py script …' -cp "${FNAME_UDEV_RULES_BACKLIGHT}" "${PATH_UDEV_RULES}/" +msg 'Making backlight devices available to user-run backlight script …' +cp "${PATH_TO_COPY}/${FNAME_UDEV_RULES_BACKLIGHT}" "${PATH_UDEV_RULES}/" udevadm control --reload-rules udevadm trigger --action=add --subsystem-match=backlight diff --git a/start_user.sh b/setup_scripts/start_user.sh similarity index 86% rename from start_user.sh rename to setup_scripts/start_user.sh index df49b1b..be0e919 100755 --- a/start_user.sh +++ b/setup_scripts/start_user.sh @@ -2,7 +2,7 @@ . "$(dirname "$0")/_lib.sh" # constants we might want to change at some point -PATH_SKEL_USER="$(pwd)/home_user" +PATH_SKEL_USER="${PATH_REPO}/home_user" augment_profile diff --git a/90-backlight.rules b/to_copy/90-backlight.rules similarity index 100% rename from 90-backlight.rules rename to to_copy/90-backlight.rules -- 2.30.2