From 6d033d68acf9273f98edc85878aee4db85a3917e Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 15 Apr 2025 13:05:09 +0200 Subject: [PATCH] Move .plomlib.sh to more generally named .plomlib --- bookworm/home/all/.bashrc | 2 +- bookworm/home/all/{.plomlib.sh => .plomlib}/file_dot_variants | 0 bookworm/home/all/.profile | 2 +- bookworm/scripts/lib/setup_users | 2 +- testing/home/all/{.plomlib.sh => .plomlib}/file_dot_variants | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/abort | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/abort_if_exists | 0 .../home/desktop/{.plomlib.sh => .plomlib}/audio_dev_is_mute | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/constants_borg | 0 .../home/desktop/{.plomlib.sh => .plomlib}/constants_secrets | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/constants_ssh | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/constants_user | 0 .../home/desktop/{.plomlib.sh => .plomlib}/expect_min_n_args | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/expect_n_args | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/get_passphrase | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/mount_secrets | 0 .../home/desktop/{.plomlib.sh => .plomlib}/path_tmp_timestamped | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/print_usage | 0 testing/home/desktop/{.plomlib.sh => .plomlib}/retry_until | 0 testing/home/t490s/.nonpath_bins/status.sh | 2 +- 20 files changed, 4 insertions(+), 4 deletions(-) rename bookworm/home/all/{.plomlib.sh => .plomlib}/file_dot_variants (100%) rename testing/home/all/{.plomlib.sh => .plomlib}/file_dot_variants (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/abort (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/abort_if_exists (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/audio_dev_is_mute (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/constants_borg (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/constants_secrets (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/constants_ssh (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/constants_user (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/expect_min_n_args (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/expect_n_args (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/get_passphrase (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/mount_secrets (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/path_tmp_timestamped (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/print_usage (100%) rename testing/home/desktop/{.plomlib.sh => .plomlib}/retry_until (100%) diff --git a/bookworm/home/all/.bashrc b/bookworm/home/all/.bashrc index 636c408..e748315 100644 --- a/bookworm/home/all/.bashrc +++ b/bookworm/home/all/.bashrc @@ -25,5 +25,5 @@ PS3="${tput_color}select: ${tput_reset}" PS4="${tput_color}+ ${tput_reset}" # include others -. "${HOME}/.plomlib.sh/file_dot_variants" +. "${HOME}/.plomlib/file_dot_variants" file_dot_variants "${HOME}/\.bashrc" diff --git a/bookworm/home/all/.plomlib.sh/file_dot_variants b/bookworm/home/all/.plomlib/file_dot_variants similarity index 100% rename from bookworm/home/all/.plomlib.sh/file_dot_variants rename to bookworm/home/all/.plomlib/file_dot_variants diff --git a/bookworm/home/all/.profile b/bookworm/home/all/.profile index 13fa422..51acedd 100644 --- a/bookworm/home/all/.profile +++ b/bookworm/home/all/.profile @@ -16,5 +16,5 @@ PATH_LOCAL_BIN="${HOME}/.local/bin" export PATH # include others -. "${HOME}/.plomlib.sh/file_dot_variants" +. "${HOME}/.plomlib/file_dot_variants" file_dot_variants "${HOME}/\.profile" diff --git a/bookworm/scripts/lib/setup_users b/bookworm/scripts/lib/setup_users index 0d8f21b..349c6a3 100644 --- a/bookworm/scripts/lib/setup_users +++ b/bookworm/scripts/lib/setup_users @@ -16,7 +16,7 @@ setup_users() { copy_dirtree "${_PATH_CONF_HOME}" "${PATH_USER_HOME}" ${_MIN_TAGS} ${_TAGS_USER} mkdir -p "${_PATH_USER_BIN}" cd "${_PATH_USER_BIN}" - ln -s ../../.plomlib.sh lib + ln -s ../../.plomlib lib cd - > /dev/null chown -R "${USERNAME}:${USERNAME}" "${PATH_USER_HOME}" } diff --git a/testing/home/all/.plomlib.sh/file_dot_variants b/testing/home/all/.plomlib/file_dot_variants similarity index 100% rename from testing/home/all/.plomlib.sh/file_dot_variants rename to testing/home/all/.plomlib/file_dot_variants diff --git a/testing/home/desktop/.plomlib.sh/abort b/testing/home/desktop/.plomlib/abort similarity index 100% rename from testing/home/desktop/.plomlib.sh/abort rename to testing/home/desktop/.plomlib/abort diff --git a/testing/home/desktop/.plomlib.sh/abort_if_exists b/testing/home/desktop/.plomlib/abort_if_exists similarity index 100% rename from testing/home/desktop/.plomlib.sh/abort_if_exists rename to testing/home/desktop/.plomlib/abort_if_exists diff --git a/testing/home/desktop/.plomlib.sh/audio_dev_is_mute b/testing/home/desktop/.plomlib/audio_dev_is_mute similarity index 100% rename from testing/home/desktop/.plomlib.sh/audio_dev_is_mute rename to testing/home/desktop/.plomlib/audio_dev_is_mute diff --git a/testing/home/desktop/.plomlib.sh/constants_borg b/testing/home/desktop/.plomlib/constants_borg similarity index 100% rename from testing/home/desktop/.plomlib.sh/constants_borg rename to testing/home/desktop/.plomlib/constants_borg diff --git a/testing/home/desktop/.plomlib.sh/constants_secrets b/testing/home/desktop/.plomlib/constants_secrets similarity index 100% rename from testing/home/desktop/.plomlib.sh/constants_secrets rename to testing/home/desktop/.plomlib/constants_secrets diff --git a/testing/home/desktop/.plomlib.sh/constants_ssh b/testing/home/desktop/.plomlib/constants_ssh similarity index 100% rename from testing/home/desktop/.plomlib.sh/constants_ssh rename to testing/home/desktop/.plomlib/constants_ssh diff --git a/testing/home/desktop/.plomlib.sh/constants_user b/testing/home/desktop/.plomlib/constants_user similarity index 100% rename from testing/home/desktop/.plomlib.sh/constants_user rename to testing/home/desktop/.plomlib/constants_user diff --git a/testing/home/desktop/.plomlib.sh/expect_min_n_args b/testing/home/desktop/.plomlib/expect_min_n_args similarity index 100% rename from testing/home/desktop/.plomlib.sh/expect_min_n_args rename to testing/home/desktop/.plomlib/expect_min_n_args diff --git a/testing/home/desktop/.plomlib.sh/expect_n_args b/testing/home/desktop/.plomlib/expect_n_args similarity index 100% rename from testing/home/desktop/.plomlib.sh/expect_n_args rename to testing/home/desktop/.plomlib/expect_n_args diff --git a/testing/home/desktop/.plomlib.sh/get_passphrase b/testing/home/desktop/.plomlib/get_passphrase similarity index 100% rename from testing/home/desktop/.plomlib.sh/get_passphrase rename to testing/home/desktop/.plomlib/get_passphrase diff --git a/testing/home/desktop/.plomlib.sh/mount_secrets b/testing/home/desktop/.plomlib/mount_secrets similarity index 100% rename from testing/home/desktop/.plomlib.sh/mount_secrets rename to testing/home/desktop/.plomlib/mount_secrets diff --git a/testing/home/desktop/.plomlib.sh/path_tmp_timestamped b/testing/home/desktop/.plomlib/path_tmp_timestamped similarity index 100% rename from testing/home/desktop/.plomlib.sh/path_tmp_timestamped rename to testing/home/desktop/.plomlib/path_tmp_timestamped diff --git a/testing/home/desktop/.plomlib.sh/print_usage b/testing/home/desktop/.plomlib/print_usage similarity index 100% rename from testing/home/desktop/.plomlib.sh/print_usage rename to testing/home/desktop/.plomlib/print_usage diff --git a/testing/home/desktop/.plomlib.sh/retry_until b/testing/home/desktop/.plomlib/retry_until similarity index 100% rename from testing/home/desktop/.plomlib.sh/retry_until rename to testing/home/desktop/.plomlib/retry_until diff --git a/testing/home/t490s/.nonpath_bins/status.sh b/testing/home/t490s/.nonpath_bins/status.sh index 379ef4a..2de1358 100755 --- a/testing/home/t490s/.nonpath_bins/status.sh +++ b/testing/home/t490s/.nonpath_bins/status.sh @@ -2,7 +2,7 @@ # see sway-bar(5) and swaybar-protocol(7) set -e -. "${HOME}/.plomlib.sh/audio_dev_is_mute" +. "${HOME}/.plomlib/audio_dev_is_mute" SYSCLASS_DIR=/sys/class -- 2.30.2