From 59c7253059efbf85d5a838fe157c25ba0506844e Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 13 Aug 2025 05:53:51 +0200 Subject: [PATCH] Library files should end in .sh. --- ...file_dot_variants => file_dot_variants.sh} | 0 .../copy/catgirl/home/plom/.plomlib/abort | 1 - .../copy/catgirl/home/plom/.plomlib/abort.sh | 1 + .../catgirl/home/plom/.plomlib/constants_user | 1 - .../home/plom/.plomlib/constants_user.sh | 1 + .../catgirl/home/plom/.plomlib/expect_n_args | 1 - .../home/plom/.plomlib/expect_n_args.sh | 1 + .../home/plom/.plomlib/constants_seedbox | 1 - .../home/plom/.plomlib/constants_seedbox.sh | 1 + .../plom/.plomlib/expected_rtorrent_files | 1 - .../plom/.plomlib/expected_rtorrent_files.sh | 1 + .../seedbox/home/plom/.plomlib/for_line_in | 1 - .../seedbox/home/plom/.plomlib/for_line_in.sh | 1 + bookworm/scripts/diff_tagged_files.sh | 8 ++++---- ...INSTALLER_VERSION => INSTALLER_VERSION.sh} | 0 bookworm/scripts/lib/{abort => abort.sh} | 2 +- ...nd_unknown => abort_if_command_unknown.sh} | 2 +- ...abort_if_not_user => abort_if_not_user.sh} | 2 +- .../{apt_get_digested => apt_get_digested.sh} | 4 ++-- ...nished_marker => check_finished_marker.sh} | 2 +- .../lib/{constants_etc => constants_etc.sh} | 0 ...nstants_finished => constants_finished.sh} | 0 ...tants_repopaths => constants_repopaths.sh} | 0 ...constants_seedbox => constants_seedbox.sh} | 0 .../lib/{constants_ssh => constants_ssh.sh} | 2 +- .../lib/{constants_user => constants_user.sh} | 0 ...trees_of_tags => copy_dirtrees_of_tags.sh} | 2 +- .../scripts/lib/{core_setup => core_setup.sh} | 10 +++++----- ...ges_of_tags => ensure_packages_of_tags.sh} | 4 ++-- .../lib/{expect_n_args => expect_n_args.sh} | 2 +- ...rrent_files => expected_rtorrent_files.sh} | 0 .../lib/{for_line_in => for_line_in.sh} | 0 .../lib/{install_tags => install_tags.sh} | 6 +++--- .../lib/{prefixed_msg => prefixed_msg.sh} | 0 ...finished_marker => put_finished_marker.sh} | 4 ++-- .../lib/{tagdir_parsing => tagdir_parsing.sh} | 0 bookworm/scripts/lib/{trapp => trapp.sh} | 0 bookworm/scripts/minimize_installation.sh | 6 +++--- bookworm/scripts/setup_catgirl.sh | 10 +++++----- bookworm/scripts/setup_seedbox.sh | 8 ++++---- bookworm/scripts/setup_server.sh | 20 +++++++++---------- testing/scripts/init_server_access.sh | 12 +++++------ testing/scripts/lib/INSTALLER_VERSION | 1 - testing/scripts/lib/INSTALLER_VERSION.sh | 1 + testing/scripts/lib/abort | 1 - testing/scripts/lib/abort.sh | 1 + testing/scripts/lib/abort_if_command_unknown | 1 - .../scripts/lib/abort_if_command_unknown.sh | 1 + testing/scripts/lib/abort_if_exists | 1 - testing/scripts/lib/abort_if_exists.sh | 1 + testing/scripts/lib/abort_if_not_user | 1 - testing/scripts/lib/abort_if_not_user.sh | 1 + testing/scripts/lib/abort_if_offline | 1 - testing/scripts/lib/abort_if_offline.sh | 1 + testing/scripts/lib/apt_get_digested | 1 - testing/scripts/lib/apt_get_digested.sh | 1 + testing/scripts/lib/check_finished_marker | 1 - testing/scripts/lib/check_finished_marker.sh | 1 + testing/scripts/lib/constants_borg | 1 - testing/scripts/lib/constants_borg.sh | 1 + testing/scripts/lib/constants_etc | 1 - testing/scripts/lib/constants_etc.sh | 1 + testing/scripts/lib/constants_finished | 1 - testing/scripts/lib/constants_finished.sh | 1 + testing/scripts/lib/constants_installer | 1 - testing/scripts/lib/constants_installer.sh | 1 + testing/scripts/lib/constants_repopaths | 1 - testing/scripts/lib/constants_repopaths.sh | 1 + testing/scripts/lib/constants_secrets | 1 - testing/scripts/lib/constants_secrets.sh | 1 + testing/scripts/lib/constants_seedbox | 1 - testing/scripts/lib/constants_seedbox.sh | 1 + testing/scripts/lib/constants_ssh | 1 - testing/scripts/lib/constants_ssh.sh | 1 + testing/scripts/lib/constants_user | 1 - testing/scripts/lib/constants_user.sh | 1 + testing/scripts/lib/copy_and_unmount_secrets | 1 - .../scripts/lib/copy_and_unmount_secrets.sh | 1 + testing/scripts/lib/copy_dirtrees_of_tags | 1 - testing/scripts/lib/copy_dirtrees_of_tags.sh | 1 + testing/scripts/lib/core_setup | 1 - testing/scripts/lib/core_setup.sh | 1 + testing/scripts/lib/ensure_packages_of_tags | 1 - .../scripts/lib/ensure_packages_of_tags.sh | 1 + testing/scripts/lib/expect_n_args | 1 - testing/scripts/lib/expect_n_args.sh | 1 + testing/scripts/lib/expected_rtorrent_files | 1 - .../scripts/lib/expected_rtorrent_files.sh | 1 + testing/scripts/lib/for_line_in | 1 - testing/scripts/lib/for_line_in.sh | 1 + testing/scripts/lib/get_mountable_device_path | 1 - .../scripts/lib/get_mountable_device_path.sh | 1 + testing/scripts/lib/get_passphrase | 1 - testing/scripts/lib/get_passphrase.sh | 1 + testing/scripts/lib/mount_secrets | 1 - testing/scripts/lib/mount_secrets.sh | 1 + testing/scripts/lib/path_tmp_timestamped | 1 - testing/scripts/lib/path_tmp_timestamped.sh | 1 + testing/scripts/lib/prefixed_msg | 1 - testing/scripts/lib/prefixed_msg.sh | 1 + testing/scripts/lib/put_finished_marker | 1 - testing/scripts/lib/put_finished_marker.sh | 1 + testing/scripts/lib/retry_until | 1 - testing/scripts/lib/retry_until.sh | 1 + testing/scripts/lib/tagdir_parsing | 1 - testing/scripts/lib/tagdir_parsing.sh | 1 + testing/scripts/lib/trapp | 1 - testing/scripts/lib/trapp.sh | 1 + testing/scripts/pull_catgirl_logs.sh | 14 ++++++------- testing/scripts/sync_rtorrent_download.sh | 16 +++++++-------- trixie/copy/desktop/home/plom/.plomlib/abort | 1 - .../copy/desktop/home/plom/.plomlib/abort.sh | 1 + .../home/plom/.plomlib/abort_if_exists | 1 - .../home/plom/.plomlib/abort_if_exists.sh | 1 + ...audio_dev_is_mute => audio_dev_is_mute.sh} | 0 .../desktop/home/plom/.plomlib/constants_borg | 1 - .../home/plom/.plomlib/constants_borg.sh | 1 + .../home/plom/.plomlib/constants_secrets | 1 - .../home/plom/.plomlib/constants_secrets.sh | 1 + .../desktop/home/plom/.plomlib/constants_ssh | 1 - .../home/plom/.plomlib/constants_ssh.sh | 1 + .../desktop/home/plom/.plomlib/constants_user | 1 - .../home/plom/.plomlib/constants_user.sh | 1 + .../plom/.plomlib/copy_and_unmount_secrets | 1 - .../plom/.plomlib/copy_and_unmount_secrets.sh | 1 + .../desktop/home/plom/.plomlib/expect_n_args | 1 - .../home/plom/.plomlib/expect_n_args.sh | 1 + .../desktop/home/plom/.plomlib/get_passphrase | 1 - .../home/plom/.plomlib/get_passphrase.sh | 1 + .../desktop/home/plom/.plomlib/mount_secrets | 1 - .../home/plom/.plomlib/mount_secrets.sh | 1 + .../home/plom/.plomlib/path_tmp_timestamped | 1 - .../plom/.plomlib/path_tmp_timestamped.sh | 1 + .../desktop/home/plom/.plomlib/prefixed_msg | 1 - .../home/plom/.plomlib/prefixed_msg.sh | 1 + .../.plomlib/{print_usage => print_usage.sh} | 0 .../desktop/home/plom/.plomlib/retry_until | 1 - .../desktop/home/plom/.plomlib/retry_until.sh | 1 + trixie/scripts/_setup_secrets_user.sh | 16 +++++++-------- trixie/scripts/from_older_upgrade.sh | 14 ++++++------- ...INSTALLER_VERSION => INSTALLER_VERSION.sh} | 0 trixie/scripts/lib/abort | 1 - trixie/scripts/lib/abort.sh | 1 + trixie/scripts/lib/abort_if_command_unknown | 1 - .../scripts/lib/abort_if_command_unknown.sh | 1 + .../{abort_if_exists => abort_if_exists.sh} | 2 +- trixie/scripts/lib/abort_if_not_user | 1 - trixie/scripts/lib/abort_if_not_user.sh | 1 + .../{abort_if_offline => abort_if_offline.sh} | 2 +- trixie/scripts/lib/apt_get_digested | 1 - trixie/scripts/lib/apt_get_digested.sh | 1 + trixie/scripts/lib/check_finished_marker | 1 - trixie/scripts/lib/check_finished_marker.sh | 1 + .../lib/{constants_borg => constants_borg.sh} | 0 trixie/scripts/lib/constants_etc | 1 - trixie/scripts/lib/constants_etc.sh | 1 + trixie/scripts/lib/constants_finished | 1 - trixie/scripts/lib/constants_finished.sh | 1 + ...tants_installer => constants_installer.sh} | 0 ...nstants_releases => constants_releases.sh} | 0 trixie/scripts/lib/constants_repopaths | 1 - trixie/scripts/lib/constants_repopaths.sh | 1 + ...constants_secrets => constants_secrets.sh} | 2 +- trixie/scripts/lib/constants_seedbox | 1 - trixie/scripts/lib/constants_seedbox.sh | 1 + trixie/scripts/lib/constants_ssh | 1 - trixie/scripts/lib/constants_ssh.sh | 1 + trixie/scripts/lib/constants_user | 1 - trixie/scripts/lib/constants_user.sh | 1 + ...nt_secrets => copy_and_unmount_secrets.sh} | 2 +- trixie/scripts/lib/copy_dirtrees_of_tags | 1 - trixie/scripts/lib/copy_dirtrees_of_tags.sh | 1 + trixie/scripts/lib/core_setup | 1 - trixie/scripts/lib/core_setup.sh | 1 + trixie/scripts/lib/ensure_packages_of_tags | 1 - trixie/scripts/lib/ensure_packages_of_tags.sh | 1 + trixie/scripts/lib/expect_n_args | 1 - trixie/scripts/lib/expect_n_args.sh | 1 + trixie/scripts/lib/expected_rtorrent_files | 1 - trixie/scripts/lib/expected_rtorrent_files.sh | 1 + trixie/scripts/lib/for_line_in | 1 - trixie/scripts/lib/for_line_in.sh | 1 + ...vice_path => get_mountable_device_path.sh} | 2 +- .../lib/{get_passphrase => get_passphrase.sh} | 0 trixie/scripts/lib/install_tags | 1 - trixie/scripts/lib/install_tags.sh | 1 + .../lib/{mount_secrets => mount_secrets.sh} | 12 +++++------ ...mp_timestamped => path_tmp_timestamped.sh} | 0 trixie/scripts/lib/prefixed_msg | 1 - trixie/scripts/lib/prefixed_msg.sh | 1 + trixie/scripts/lib/put_finished_marker | 1 - trixie/scripts/lib/put_finished_marker.sh | 1 + .../lib/{retry_until => retry_until.sh} | 0 trixie/scripts/lib/tagdir_parsing | 1 - trixie/scripts/lib/tagdir_parsing.sh | 1 + trixie/scripts/lib/trapp | 1 - trixie/scripts/lib/trapp.sh | 1 + trixie/scripts/make_writable_installer.sh | 20 +++++++++---------- trixie/scripts/setup_desktop.sh | 20 +++++++++---------- trixie/scripts/setup_reform_qemu.sh | 10 +++++----- trixie/scripts/setup_secrets.sh | 12 +++++------ trixie/scripts/update_preseed.sh | 12 +++++------ 202 files changed, 205 insertions(+), 205 deletions(-) rename bookworm/copy/all/home/plom/.plomlib/{file_dot_variants => file_dot_variants.sh} (100%) delete mode 120000 bookworm/copy/catgirl/home/plom/.plomlib/abort create mode 120000 bookworm/copy/catgirl/home/plom/.plomlib/abort.sh delete mode 120000 bookworm/copy/catgirl/home/plom/.plomlib/constants_user create mode 120000 bookworm/copy/catgirl/home/plom/.plomlib/constants_user.sh delete mode 120000 bookworm/copy/catgirl/home/plom/.plomlib/expect_n_args create mode 120000 bookworm/copy/catgirl/home/plom/.plomlib/expect_n_args.sh delete mode 120000 bookworm/copy/seedbox/home/plom/.plomlib/constants_seedbox create mode 120000 bookworm/copy/seedbox/home/plom/.plomlib/constants_seedbox.sh delete mode 120000 bookworm/copy/seedbox/home/plom/.plomlib/expected_rtorrent_files create mode 120000 bookworm/copy/seedbox/home/plom/.plomlib/expected_rtorrent_files.sh delete mode 120000 bookworm/copy/seedbox/home/plom/.plomlib/for_line_in create mode 120000 bookworm/copy/seedbox/home/plom/.plomlib/for_line_in.sh rename bookworm/scripts/lib/{INSTALLER_VERSION => INSTALLER_VERSION.sh} (100%) rename bookworm/scripts/lib/{abort => abort.sh} (69%) rename bookworm/scripts/lib/{abort_if_command_unknown => abort_if_command_unknown.sh} (89%) rename bookworm/scripts/lib/{abort_if_not_user => abort_if_not_user.sh} (87%) rename bookworm/scripts/lib/{apt_get_digested => apt_get_digested.sh} (98%) rename bookworm/scripts/lib/{check_finished_marker => check_finished_marker.sh} (87%) rename bookworm/scripts/lib/{constants_etc => constants_etc.sh} (100%) rename bookworm/scripts/lib/{constants_finished => constants_finished.sh} (100%) rename bookworm/scripts/lib/{constants_repopaths => constants_repopaths.sh} (100%) rename bookworm/scripts/lib/{constants_seedbox => constants_seedbox.sh} (100%) rename bookworm/scripts/lib/{constants_ssh => constants_ssh.sh} (73%) rename bookworm/scripts/lib/{constants_user => constants_user.sh} (100%) rename bookworm/scripts/lib/{copy_dirtrees_of_tags => copy_dirtrees_of_tags.sh} (98%) rename bookworm/scripts/lib/{core_setup => core_setup.sh} (88%) rename bookworm/scripts/lib/{ensure_packages_of_tags => ensure_packages_of_tags.sh} (95%) rename bookworm/scripts/lib/{expect_n_args => expect_n_args.sh} (97%) rename bookworm/scripts/lib/{expected_rtorrent_files => expected_rtorrent_files.sh} (100%) rename bookworm/scripts/lib/{for_line_in => for_line_in.sh} (100%) rename bookworm/scripts/lib/{install_tags => install_tags.sh} (75%) rename bookworm/scripts/lib/{prefixed_msg => prefixed_msg.sh} (100%) rename bookworm/scripts/lib/{put_finished_marker => put_finished_marker.sh} (74%) rename bookworm/scripts/lib/{tagdir_parsing => tagdir_parsing.sh} (100%) rename bookworm/scripts/lib/{trapp => trapp.sh} (100%) delete mode 120000 testing/scripts/lib/INSTALLER_VERSION create mode 120000 testing/scripts/lib/INSTALLER_VERSION.sh delete mode 120000 testing/scripts/lib/abort create mode 120000 testing/scripts/lib/abort.sh delete mode 120000 testing/scripts/lib/abort_if_command_unknown create mode 120000 testing/scripts/lib/abort_if_command_unknown.sh delete mode 120000 testing/scripts/lib/abort_if_exists create mode 120000 testing/scripts/lib/abort_if_exists.sh delete mode 120000 testing/scripts/lib/abort_if_not_user create mode 120000 testing/scripts/lib/abort_if_not_user.sh delete mode 120000 testing/scripts/lib/abort_if_offline create mode 120000 testing/scripts/lib/abort_if_offline.sh delete mode 120000 testing/scripts/lib/apt_get_digested create mode 120000 testing/scripts/lib/apt_get_digested.sh delete mode 120000 testing/scripts/lib/check_finished_marker create mode 120000 testing/scripts/lib/check_finished_marker.sh delete mode 120000 testing/scripts/lib/constants_borg create mode 120000 testing/scripts/lib/constants_borg.sh delete mode 120000 testing/scripts/lib/constants_etc create mode 120000 testing/scripts/lib/constants_etc.sh delete mode 120000 testing/scripts/lib/constants_finished create mode 120000 testing/scripts/lib/constants_finished.sh delete mode 120000 testing/scripts/lib/constants_installer create mode 120000 testing/scripts/lib/constants_installer.sh delete mode 120000 testing/scripts/lib/constants_repopaths create mode 120000 testing/scripts/lib/constants_repopaths.sh delete mode 120000 testing/scripts/lib/constants_secrets create mode 120000 testing/scripts/lib/constants_secrets.sh delete mode 120000 testing/scripts/lib/constants_seedbox create mode 120000 testing/scripts/lib/constants_seedbox.sh delete mode 120000 testing/scripts/lib/constants_ssh create mode 120000 testing/scripts/lib/constants_ssh.sh delete mode 120000 testing/scripts/lib/constants_user create mode 120000 testing/scripts/lib/constants_user.sh delete mode 120000 testing/scripts/lib/copy_and_unmount_secrets create mode 120000 testing/scripts/lib/copy_and_unmount_secrets.sh delete mode 120000 testing/scripts/lib/copy_dirtrees_of_tags create mode 120000 testing/scripts/lib/copy_dirtrees_of_tags.sh delete mode 120000 testing/scripts/lib/core_setup create mode 120000 testing/scripts/lib/core_setup.sh delete mode 120000 testing/scripts/lib/ensure_packages_of_tags create mode 120000 testing/scripts/lib/ensure_packages_of_tags.sh delete mode 120000 testing/scripts/lib/expect_n_args create mode 120000 testing/scripts/lib/expect_n_args.sh delete mode 120000 testing/scripts/lib/expected_rtorrent_files create mode 120000 testing/scripts/lib/expected_rtorrent_files.sh delete mode 120000 testing/scripts/lib/for_line_in create mode 120000 testing/scripts/lib/for_line_in.sh delete mode 120000 testing/scripts/lib/get_mountable_device_path create mode 120000 testing/scripts/lib/get_mountable_device_path.sh delete mode 120000 testing/scripts/lib/get_passphrase create mode 120000 testing/scripts/lib/get_passphrase.sh delete mode 120000 testing/scripts/lib/mount_secrets create mode 120000 testing/scripts/lib/mount_secrets.sh delete mode 120000 testing/scripts/lib/path_tmp_timestamped create mode 120000 testing/scripts/lib/path_tmp_timestamped.sh delete mode 120000 testing/scripts/lib/prefixed_msg create mode 120000 testing/scripts/lib/prefixed_msg.sh delete mode 120000 testing/scripts/lib/put_finished_marker create mode 120000 testing/scripts/lib/put_finished_marker.sh delete mode 120000 testing/scripts/lib/retry_until create mode 120000 testing/scripts/lib/retry_until.sh delete mode 120000 testing/scripts/lib/tagdir_parsing create mode 120000 testing/scripts/lib/tagdir_parsing.sh delete mode 120000 testing/scripts/lib/trapp create mode 120000 testing/scripts/lib/trapp.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/abort create mode 120000 trixie/copy/desktop/home/plom/.plomlib/abort.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/abort_if_exists create mode 120000 trixie/copy/desktop/home/plom/.plomlib/abort_if_exists.sh rename trixie/copy/desktop/home/plom/.plomlib/{audio_dev_is_mute => audio_dev_is_mute.sh} (100%) delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/constants_borg create mode 120000 trixie/copy/desktop/home/plom/.plomlib/constants_borg.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/constants_secrets create mode 120000 trixie/copy/desktop/home/plom/.plomlib/constants_secrets.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/constants_ssh create mode 120000 trixie/copy/desktop/home/plom/.plomlib/constants_ssh.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/constants_user create mode 120000 trixie/copy/desktop/home/plom/.plomlib/constants_user.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/copy_and_unmount_secrets create mode 120000 trixie/copy/desktop/home/plom/.plomlib/copy_and_unmount_secrets.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/expect_n_args create mode 120000 trixie/copy/desktop/home/plom/.plomlib/expect_n_args.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/get_passphrase create mode 120000 trixie/copy/desktop/home/plom/.plomlib/get_passphrase.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/mount_secrets create mode 120000 trixie/copy/desktop/home/plom/.plomlib/mount_secrets.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/path_tmp_timestamped create mode 120000 trixie/copy/desktop/home/plom/.plomlib/path_tmp_timestamped.sh delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/prefixed_msg create mode 120000 trixie/copy/desktop/home/plom/.plomlib/prefixed_msg.sh rename trixie/copy/desktop/home/plom/.plomlib/{print_usage => print_usage.sh} (100%) delete mode 120000 trixie/copy/desktop/home/plom/.plomlib/retry_until create mode 120000 trixie/copy/desktop/home/plom/.plomlib/retry_until.sh rename trixie/scripts/lib/{INSTALLER_VERSION => INSTALLER_VERSION.sh} (100%) delete mode 120000 trixie/scripts/lib/abort create mode 120000 trixie/scripts/lib/abort.sh delete mode 120000 trixie/scripts/lib/abort_if_command_unknown create mode 120000 trixie/scripts/lib/abort_if_command_unknown.sh rename trixie/scripts/lib/{abort_if_exists => abort_if_exists.sh} (87%) delete mode 120000 trixie/scripts/lib/abort_if_not_user create mode 120000 trixie/scripts/lib/abort_if_not_user.sh rename trixie/scripts/lib/{abort_if_offline => abort_if_offline.sh} (88%) delete mode 120000 trixie/scripts/lib/apt_get_digested create mode 120000 trixie/scripts/lib/apt_get_digested.sh delete mode 120000 trixie/scripts/lib/check_finished_marker create mode 120000 trixie/scripts/lib/check_finished_marker.sh rename trixie/scripts/lib/{constants_borg => constants_borg.sh} (100%) delete mode 120000 trixie/scripts/lib/constants_etc create mode 120000 trixie/scripts/lib/constants_etc.sh delete mode 120000 trixie/scripts/lib/constants_finished create mode 120000 trixie/scripts/lib/constants_finished.sh rename trixie/scripts/lib/{constants_installer => constants_installer.sh} (100%) rename trixie/scripts/lib/{constants_releases => constants_releases.sh} (100%) delete mode 120000 trixie/scripts/lib/constants_repopaths create mode 120000 trixie/scripts/lib/constants_repopaths.sh rename trixie/scripts/lib/{constants_secrets => constants_secrets.sh} (93%) delete mode 120000 trixie/scripts/lib/constants_seedbox create mode 120000 trixie/scripts/lib/constants_seedbox.sh delete mode 120000 trixie/scripts/lib/constants_ssh create mode 120000 trixie/scripts/lib/constants_ssh.sh delete mode 120000 trixie/scripts/lib/constants_user create mode 120000 trixie/scripts/lib/constants_user.sh rename trixie/scripts/lib/{copy_and_unmount_secrets => copy_and_unmount_secrets.sh} (88%) delete mode 120000 trixie/scripts/lib/copy_dirtrees_of_tags create mode 120000 trixie/scripts/lib/copy_dirtrees_of_tags.sh delete mode 120000 trixie/scripts/lib/core_setup create mode 120000 trixie/scripts/lib/core_setup.sh delete mode 120000 trixie/scripts/lib/ensure_packages_of_tags create mode 120000 trixie/scripts/lib/ensure_packages_of_tags.sh delete mode 120000 trixie/scripts/lib/expect_n_args create mode 120000 trixie/scripts/lib/expect_n_args.sh delete mode 120000 trixie/scripts/lib/expected_rtorrent_files create mode 120000 trixie/scripts/lib/expected_rtorrent_files.sh delete mode 120000 trixie/scripts/lib/for_line_in create mode 120000 trixie/scripts/lib/for_line_in.sh rename trixie/scripts/lib/{get_mountable_device_path => get_mountable_device_path.sh} (95%) rename trixie/scripts/lib/{get_passphrase => get_passphrase.sh} (100%) delete mode 120000 trixie/scripts/lib/install_tags create mode 120000 trixie/scripts/lib/install_tags.sh rename trixie/scripts/lib/{mount_secrets => mount_secrets.sh} (80%) rename trixie/scripts/lib/{path_tmp_timestamped => path_tmp_timestamped.sh} (100%) delete mode 120000 trixie/scripts/lib/prefixed_msg create mode 120000 trixie/scripts/lib/prefixed_msg.sh delete mode 120000 trixie/scripts/lib/put_finished_marker create mode 120000 trixie/scripts/lib/put_finished_marker.sh rename trixie/scripts/lib/{retry_until => retry_until.sh} (100%) delete mode 120000 trixie/scripts/lib/tagdir_parsing create mode 120000 trixie/scripts/lib/tagdir_parsing.sh delete mode 120000 trixie/scripts/lib/trapp create mode 120000 trixie/scripts/lib/trapp.sh diff --git a/bookworm/copy/all/home/plom/.plomlib/file_dot_variants b/bookworm/copy/all/home/plom/.plomlib/file_dot_variants.sh similarity index 100% rename from bookworm/copy/all/home/plom/.plomlib/file_dot_variants rename to bookworm/copy/all/home/plom/.plomlib/file_dot_variants.sh diff --git a/bookworm/copy/catgirl/home/plom/.plomlib/abort b/bookworm/copy/catgirl/home/plom/.plomlib/abort deleted file mode 120000 index 1fa89a1..0000000 --- a/bookworm/copy/catgirl/home/plom/.plomlib/abort +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/abort \ No newline at end of file diff --git a/bookworm/copy/catgirl/home/plom/.plomlib/abort.sh b/bookworm/copy/catgirl/home/plom/.plomlib/abort.sh new file mode 120000 index 0000000..45aefdb --- /dev/null +++ b/bookworm/copy/catgirl/home/plom/.plomlib/abort.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/abort.sh \ No newline at end of file diff --git a/bookworm/copy/catgirl/home/plom/.plomlib/constants_user b/bookworm/copy/catgirl/home/plom/.plomlib/constants_user deleted file mode 120000 index 6aa6571..0000000 --- a/bookworm/copy/catgirl/home/plom/.plomlib/constants_user +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/constants_user \ No newline at end of file diff --git a/bookworm/copy/catgirl/home/plom/.plomlib/constants_user.sh b/bookworm/copy/catgirl/home/plom/.plomlib/constants_user.sh new file mode 120000 index 0000000..dc8c43e --- /dev/null +++ b/bookworm/copy/catgirl/home/plom/.plomlib/constants_user.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/constants_user.sh \ No newline at end of file diff --git a/bookworm/copy/catgirl/home/plom/.plomlib/expect_n_args b/bookworm/copy/catgirl/home/plom/.plomlib/expect_n_args deleted file mode 120000 index eddbca9..0000000 --- a/bookworm/copy/catgirl/home/plom/.plomlib/expect_n_args +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/expect_n_args \ No newline at end of file diff --git a/bookworm/copy/catgirl/home/plom/.plomlib/expect_n_args.sh b/bookworm/copy/catgirl/home/plom/.plomlib/expect_n_args.sh new file mode 120000 index 0000000..9582f5f --- /dev/null +++ b/bookworm/copy/catgirl/home/plom/.plomlib/expect_n_args.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/expect_n_args.sh \ No newline at end of file diff --git a/bookworm/copy/seedbox/home/plom/.plomlib/constants_seedbox b/bookworm/copy/seedbox/home/plom/.plomlib/constants_seedbox deleted file mode 120000 index e625e65..0000000 --- a/bookworm/copy/seedbox/home/plom/.plomlib/constants_seedbox +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/constants_seedbox \ No newline at end of file diff --git a/bookworm/copy/seedbox/home/plom/.plomlib/constants_seedbox.sh b/bookworm/copy/seedbox/home/plom/.plomlib/constants_seedbox.sh new file mode 120000 index 0000000..de9467e --- /dev/null +++ b/bookworm/copy/seedbox/home/plom/.plomlib/constants_seedbox.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/constants_seedbox.sh \ No newline at end of file diff --git a/bookworm/copy/seedbox/home/plom/.plomlib/expected_rtorrent_files b/bookworm/copy/seedbox/home/plom/.plomlib/expected_rtorrent_files deleted file mode 120000 index f71bc5e..0000000 --- a/bookworm/copy/seedbox/home/plom/.plomlib/expected_rtorrent_files +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/expected_rtorrent_files \ No newline at end of file diff --git a/bookworm/copy/seedbox/home/plom/.plomlib/expected_rtorrent_files.sh b/bookworm/copy/seedbox/home/plom/.plomlib/expected_rtorrent_files.sh new file mode 120000 index 0000000..4b56fd8 --- /dev/null +++ b/bookworm/copy/seedbox/home/plom/.plomlib/expected_rtorrent_files.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/expected_rtorrent_files.sh \ No newline at end of file diff --git a/bookworm/copy/seedbox/home/plom/.plomlib/for_line_in b/bookworm/copy/seedbox/home/plom/.plomlib/for_line_in deleted file mode 120000 index 0a015e7..0000000 --- a/bookworm/copy/seedbox/home/plom/.plomlib/for_line_in +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/for_line_in \ No newline at end of file diff --git a/bookworm/copy/seedbox/home/plom/.plomlib/for_line_in.sh b/bookworm/copy/seedbox/home/plom/.plomlib/for_line_in.sh new file mode 120000 index 0000000..5472559 --- /dev/null +++ b/bookworm/copy/seedbox/home/plom/.plomlib/for_line_in.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/for_line_in.sh \ No newline at end of file diff --git a/bookworm/scripts/diff_tagged_files.sh b/bookworm/scripts/diff_tagged_files.sh index df201d6..94d59f8 100755 --- a/bookworm/scripts/diff_tagged_files.sh +++ b/bookworm/scripts/diff_tagged_files.sh @@ -1,10 +1,10 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/abort_if_not_user -. lib/constants_user -. lib/prefixed_msg -. lib/tagdir_parsing +. lib/abort_if_not_user.sh +. lib/constants_user.sh +. lib/prefixed_msg.sh +. lib/tagdir_parsing.sh prefixed_msg_init abort_if_not_user root diff --git a/bookworm/scripts/lib/INSTALLER_VERSION b/bookworm/scripts/lib/INSTALLER_VERSION.sh similarity index 100% rename from bookworm/scripts/lib/INSTALLER_VERSION rename to bookworm/scripts/lib/INSTALLER_VERSION.sh diff --git a/bookworm/scripts/lib/abort b/bookworm/scripts/lib/abort.sh similarity index 69% rename from bookworm/scripts/lib/abort rename to bookworm/scripts/lib/abort.sh index 73f1f77..caf6412 100644 --- a/bookworm/scripts/lib/abort +++ b/bookworm/scripts/lib/abort.sh @@ -1,4 +1,4 @@ -. lib/prefixed_msg +. lib/prefixed_msg.sh abort() { prefixed_msg "$1" >&2 diff --git a/bookworm/scripts/lib/abort_if_command_unknown b/bookworm/scripts/lib/abort_if_command_unknown.sh similarity index 89% rename from bookworm/scripts/lib/abort_if_command_unknown rename to bookworm/scripts/lib/abort_if_command_unknown.sh index 81a3365..37cd2c0 100644 --- a/bookworm/scripts/lib/abort_if_command_unknown +++ b/bookworm/scripts/lib/abort_if_command_unknown.sh @@ -1,4 +1,4 @@ -. lib/abort +. lib/abort.sh abort_if_command_unknown() { if ! which "$1" > /dev/null; then diff --git a/bookworm/scripts/lib/abort_if_not_user b/bookworm/scripts/lib/abort_if_not_user.sh similarity index 87% rename from bookworm/scripts/lib/abort_if_not_user rename to bookworm/scripts/lib/abort_if_not_user.sh index a7b3da3..d52910e 100644 --- a/bookworm/scripts/lib/abort_if_not_user +++ b/bookworm/scripts/lib/abort_if_not_user.sh @@ -1,4 +1,4 @@ -. lib/abort +. lib/abort.sh abort_if_not_user() { if [ "$(whoami)" != "$1" ]; then diff --git a/bookworm/scripts/lib/apt_get_digested b/bookworm/scripts/lib/apt_get_digested.sh similarity index 98% rename from bookworm/scripts/lib/apt_get_digested rename to bookworm/scripts/lib/apt_get_digested.sh index 2550327..e9ac33f 100644 --- a/bookworm/scripts/lib/apt_get_digested +++ b/bookworm/scripts/lib/apt_get_digested.sh @@ -1,5 +1,5 @@ -. lib/for_line_in -. lib/prefixed_msg +. lib/for_line_in.sh +. lib/prefixed_msg.sh apt_get_digested() { prefixed_msg_init 'apt_get_digested' diff --git a/bookworm/scripts/lib/check_finished_marker b/bookworm/scripts/lib/check_finished_marker.sh similarity index 87% rename from bookworm/scripts/lib/check_finished_marker rename to bookworm/scripts/lib/check_finished_marker.sh index 8766882..c3f4470 100644 --- a/bookworm/scripts/lib/check_finished_marker +++ b/bookworm/scripts/lib/check_finished_marker.sh @@ -1,4 +1,4 @@ -. lib/constants_finished +. lib/constants_finished.sh check_finished_marker() { _PATH_MARKER="${PATH_ROOT_FINISHEDS}/$1" diff --git a/bookworm/scripts/lib/constants_etc b/bookworm/scripts/lib/constants_etc.sh similarity index 100% rename from bookworm/scripts/lib/constants_etc rename to bookworm/scripts/lib/constants_etc.sh diff --git a/bookworm/scripts/lib/constants_finished b/bookworm/scripts/lib/constants_finished.sh similarity index 100% rename from bookworm/scripts/lib/constants_finished rename to bookworm/scripts/lib/constants_finished.sh diff --git a/bookworm/scripts/lib/constants_repopaths b/bookworm/scripts/lib/constants_repopaths.sh similarity index 100% rename from bookworm/scripts/lib/constants_repopaths rename to bookworm/scripts/lib/constants_repopaths.sh diff --git a/bookworm/scripts/lib/constants_seedbox b/bookworm/scripts/lib/constants_seedbox.sh similarity index 100% rename from bookworm/scripts/lib/constants_seedbox rename to bookworm/scripts/lib/constants_seedbox.sh diff --git a/bookworm/scripts/lib/constants_ssh b/bookworm/scripts/lib/constants_ssh.sh similarity index 73% rename from bookworm/scripts/lib/constants_ssh rename to bookworm/scripts/lib/constants_ssh.sh index 43e6ee5..dd21e0f 100644 --- a/bookworm/scripts/lib/constants_ssh +++ b/bookworm/scripts/lib/constants_ssh.sh @@ -1,3 +1,3 @@ -. lib/constants_user +. lib/constants_user.sh PATH_REL_SSH=.ssh PATH_USER_SSH="${PATH_USER_HOME}/${PATH_REL_SSH}" diff --git a/bookworm/scripts/lib/constants_user b/bookworm/scripts/lib/constants_user.sh similarity index 100% rename from bookworm/scripts/lib/constants_user rename to bookworm/scripts/lib/constants_user.sh diff --git a/bookworm/scripts/lib/copy_dirtrees_of_tags b/bookworm/scripts/lib/copy_dirtrees_of_tags.sh similarity index 98% rename from bookworm/scripts/lib/copy_dirtrees_of_tags rename to bookworm/scripts/lib/copy_dirtrees_of_tags.sh index 4854bfa..24f927e 100644 --- a/bookworm/scripts/lib/copy_dirtrees_of_tags +++ b/bookworm/scripts/lib/copy_dirtrees_of_tags.sh @@ -1,4 +1,4 @@ -. lib/tagdir_parsing +. lib/tagdir_parsing.sh copy_dirtrees_of_tags() { _copy_dirtree() { diff --git a/bookworm/scripts/lib/core_setup b/bookworm/scripts/lib/core_setup.sh similarity index 88% rename from bookworm/scripts/lib/core_setup rename to bookworm/scripts/lib/core_setup.sh index 3ffee0a..c916b9c 100644 --- a/bookworm/scripts/lib/core_setup +++ b/bookworm/scripts/lib/core_setup.sh @@ -1,8 +1,8 @@ -. lib/apt_get_digested -. lib/constants_etc # PATH_ETC -. lib/constants_user # USERNAME -. lib/copy_dirtrees_of_tags -. lib/prefixed_msg +. lib/apt_get_digested.sh +. lib/constants_etc.sh # PATH_ETC +. lib/constants_user.sh # USERNAME +. lib/copy_dirtrees_of_tags.sh +. lib/prefixed_msg.sh core_setup() { prefixed_msg_init 'core_setup' diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags.sh similarity index 95% rename from bookworm/scripts/lib/ensure_packages_of_tags rename to bookworm/scripts/lib/ensure_packages_of_tags.sh index 3054df9..04e4271 100644 --- a/bookworm/scripts/lib/ensure_packages_of_tags +++ b/bookworm/scripts/lib/ensure_packages_of_tags.sh @@ -1,5 +1,5 @@ -. lib/apt_get_digested -. lib/prefixed_msg +. lib/apt_get_digested.sh +. lib/prefixed_msg.sh ensure_packages_of_tags() { prefixed_msg_init 'ensure_packages_of_tags' diff --git a/bookworm/scripts/lib/expect_n_args b/bookworm/scripts/lib/expect_n_args.sh similarity index 97% rename from bookworm/scripts/lib/expect_n_args rename to bookworm/scripts/lib/expect_n_args.sh index 7db333a..16df938 100644 --- a/bookworm/scripts/lib/expect_n_args +++ b/bookworm/scripts/lib/expect_n_args.sh @@ -1,4 +1,4 @@ -. lib/abort +. lib/abort.sh expect_n_args() { _N_MIN_ARGS="$1" diff --git a/bookworm/scripts/lib/expected_rtorrent_files b/bookworm/scripts/lib/expected_rtorrent_files.sh similarity index 100% rename from bookworm/scripts/lib/expected_rtorrent_files rename to bookworm/scripts/lib/expected_rtorrent_files.sh diff --git a/bookworm/scripts/lib/for_line_in b/bookworm/scripts/lib/for_line_in.sh similarity index 100% rename from bookworm/scripts/lib/for_line_in rename to bookworm/scripts/lib/for_line_in.sh diff --git a/bookworm/scripts/lib/install_tags b/bookworm/scripts/lib/install_tags.sh similarity index 75% rename from bookworm/scripts/lib/install_tags rename to bookworm/scripts/lib/install_tags.sh index 4169bd6..0b5632b 100644 --- a/bookworm/scripts/lib/install_tags +++ b/bookworm/scripts/lib/install_tags.sh @@ -1,6 +1,6 @@ -. lib/copy_dirtrees_of_tags -. lib/ensure_packages_of_tags -. lib/prefixed_msg +. lib/copy_dirtrees_of_tags.sh +. lib/ensure_packages_of_tags.sh +. lib/prefixed_msg.sh install_tags() { prefixed_msg_init 'install_tags' diff --git a/bookworm/scripts/lib/prefixed_msg b/bookworm/scripts/lib/prefixed_msg.sh similarity index 100% rename from bookworm/scripts/lib/prefixed_msg rename to bookworm/scripts/lib/prefixed_msg.sh diff --git a/bookworm/scripts/lib/put_finished_marker b/bookworm/scripts/lib/put_finished_marker.sh similarity index 74% rename from bookworm/scripts/lib/put_finished_marker rename to bookworm/scripts/lib/put_finished_marker.sh index baacfa4..238ee1f 100644 --- a/bookworm/scripts/lib/put_finished_marker +++ b/bookworm/scripts/lib/put_finished_marker.sh @@ -1,5 +1,5 @@ -. lib/constants_finished -. lib/prefixed_msg +. lib/constants_finished.sh +. lib/prefixed_msg.sh put_finished_marker() { prefixed_msg "Marking as finished: $1" diff --git a/bookworm/scripts/lib/tagdir_parsing b/bookworm/scripts/lib/tagdir_parsing.sh similarity index 100% rename from bookworm/scripts/lib/tagdir_parsing rename to bookworm/scripts/lib/tagdir_parsing.sh diff --git a/bookworm/scripts/lib/trapp b/bookworm/scripts/lib/trapp.sh similarity index 100% rename from bookworm/scripts/lib/trapp rename to bookworm/scripts/lib/trapp.sh diff --git a/bookworm/scripts/minimize_installation.sh b/bookworm/scripts/minimize_installation.sh index 01183aa..1ed6fa8 100755 --- a/bookworm/scripts/minimize_installation.sh +++ b/bookworm/scripts/minimize_installation.sh @@ -1,9 +1,9 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/apt_get_digested -. lib/ensure_packages_of_tags -. lib/prefixed_msg +. lib/apt_get_digested.sh +. lib/ensure_packages_of_tags.sh +. lib/prefixed_msg.sh prefixed_msg_init _INSTALL_TAGS="$@" diff --git a/bookworm/scripts/setup_catgirl.sh b/bookworm/scripts/setup_catgirl.sh index 982a428..2a9eff2 100755 --- a/bookworm/scripts/setup_catgirl.sh +++ b/bookworm/scripts/setup_catgirl.sh @@ -1,11 +1,11 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/check_finished_marker -. lib/constants_user # PATH_USER_HOME -. lib/expect_n_args -. lib/install_tags -. lib/prefixed_msg +. lib/check_finished_marker.sh +. lib/constants_user.sh # PATH_USER_HOME +. lib/expect_n_args.sh +. lib/install_tags.sh +. lib/prefixed_msg.sh prefixed_msg_init prefixed_msg 'starting' diff --git a/bookworm/scripts/setup_seedbox.sh b/bookworm/scripts/setup_seedbox.sh index d00f856..7bbb970 100755 --- a/bookworm/scripts/setup_seedbox.sh +++ b/bookworm/scripts/setup_seedbox.sh @@ -1,10 +1,10 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/check_finished_marker -. lib/expect_n_args -. lib/install_tags -. lib/prefixed_msg +. lib/check_finished_marker.sh +. lib/expect_n_args.sh +. lib/install_tags.sh +. lib/prefixed_msg.sh prefixed_msg_init prefixed_msg 'starting' diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh index 8b66f3e..6835f82 100755 --- a/bookworm/scripts/setup_server.sh +++ b/bookworm/scripts/setup_server.sh @@ -1,16 +1,16 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/apt_get_digested -. lib/constants_etc # PATH_ETC -. lib/constants_ssh # PATH_REL_SSH, PATH_USER_SSH -. lib/constants_user # USERNAME -. lib/copy_dirtrees_of_tags -. lib/core_setup -. lib/expect_n_args -. lib/prefixed_msg -. lib/put_finished_marker -. lib/trapp +. lib/apt_get_digested.sh +. lib/constants_etc.sh # PATH_ETC +. lib/constants_ssh.sh # PATH_REL_SSH, PATH_USER_SSH +. lib/constants_user.sh # USERNAME +. lib/copy_dirtrees_of_tags.sh +. lib/core_setup.sh +. lib/expect_n_args.sh +. lib/prefixed_msg.sh +. lib/put_finished_marker.sh +. lib/trapp.sh prefixed_msg_init prefixed_msg 'starting (setting up basics of standard server)' diff --git a/testing/scripts/init_server_access.sh b/testing/scripts/init_server_access.sh index d20ccab..ff78942 100755 --- a/testing/scripts/init_server_access.sh +++ b/testing/scripts/init_server_access.sh @@ -1,12 +1,12 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/abort_if_command_unknown -. lib/constants_ssh # PATH_REL_SSH, PATH_USER_SSH -. lib/expect_n_args -. lib/path_tmp_timestamped -. lib/prefixed_msg -. lib/trapp +. lib/abort_if_command_unknown.sh +. lib/constants_ssh.sh # PATH_REL_SSH, PATH_USER_SSH +. lib/expect_n_args.sh +. lib/path_tmp_timestamped.sh +. lib/prefixed_msg.sh +. lib/trapp.sh prefixed_msg_init 'init_server_access.sh' prefixed_msg 'starting' diff --git a/testing/scripts/lib/INSTALLER_VERSION b/testing/scripts/lib/INSTALLER_VERSION deleted file mode 120000 index 2109601..0000000 --- a/testing/scripts/lib/INSTALLER_VERSION +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/INSTALLER_VERSION \ No newline at end of file diff --git a/testing/scripts/lib/INSTALLER_VERSION.sh b/testing/scripts/lib/INSTALLER_VERSION.sh new file mode 120000 index 0000000..4c0912d --- /dev/null +++ b/testing/scripts/lib/INSTALLER_VERSION.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/INSTALLER_VERSION.sh \ No newline at end of file diff --git a/testing/scripts/lib/abort b/testing/scripts/lib/abort deleted file mode 120000 index 76dab43..0000000 --- a/testing/scripts/lib/abort +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/abort \ No newline at end of file diff --git a/testing/scripts/lib/abort.sh b/testing/scripts/lib/abort.sh new file mode 120000 index 0000000..a961839 --- /dev/null +++ b/testing/scripts/lib/abort.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/abort.sh \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_command_unknown b/testing/scripts/lib/abort_if_command_unknown deleted file mode 120000 index 5d77154..0000000 --- a/testing/scripts/lib/abort_if_command_unknown +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/abort_if_command_unknown \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_command_unknown.sh b/testing/scripts/lib/abort_if_command_unknown.sh new file mode 120000 index 0000000..eba2ad9 --- /dev/null +++ b/testing/scripts/lib/abort_if_command_unknown.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/abort_if_command_unknown.sh \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_exists b/testing/scripts/lib/abort_if_exists deleted file mode 120000 index ff35025..0000000 --- a/testing/scripts/lib/abort_if_exists +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/abort_if_exists \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_exists.sh b/testing/scripts/lib/abort_if_exists.sh new file mode 120000 index 0000000..ab12d51 --- /dev/null +++ b/testing/scripts/lib/abort_if_exists.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/abort_if_exists.sh \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_not_user b/testing/scripts/lib/abort_if_not_user deleted file mode 120000 index 2ec0928..0000000 --- a/testing/scripts/lib/abort_if_not_user +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/abort_if_not_user \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_not_user.sh b/testing/scripts/lib/abort_if_not_user.sh new file mode 120000 index 0000000..b15106d --- /dev/null +++ b/testing/scripts/lib/abort_if_not_user.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/abort_if_not_user.sh \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_offline b/testing/scripts/lib/abort_if_offline deleted file mode 120000 index 919ba38..0000000 --- a/testing/scripts/lib/abort_if_offline +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/abort_if_offline \ No newline at end of file diff --git a/testing/scripts/lib/abort_if_offline.sh b/testing/scripts/lib/abort_if_offline.sh new file mode 120000 index 0000000..3c01292 --- /dev/null +++ b/testing/scripts/lib/abort_if_offline.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/abort_if_offline.sh \ No newline at end of file diff --git a/testing/scripts/lib/apt_get_digested b/testing/scripts/lib/apt_get_digested deleted file mode 120000 index fdf81df..0000000 --- a/testing/scripts/lib/apt_get_digested +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/apt_get_digested \ No newline at end of file diff --git a/testing/scripts/lib/apt_get_digested.sh b/testing/scripts/lib/apt_get_digested.sh new file mode 120000 index 0000000..277e0b7 --- /dev/null +++ b/testing/scripts/lib/apt_get_digested.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/apt_get_digested.sh \ No newline at end of file diff --git a/testing/scripts/lib/check_finished_marker b/testing/scripts/lib/check_finished_marker deleted file mode 120000 index ce96ad4..0000000 --- a/testing/scripts/lib/check_finished_marker +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/check_finished_marker \ No newline at end of file diff --git a/testing/scripts/lib/check_finished_marker.sh b/testing/scripts/lib/check_finished_marker.sh new file mode 120000 index 0000000..a4ba73c --- /dev/null +++ b/testing/scripts/lib/check_finished_marker.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/check_finished_marker.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_borg b/testing/scripts/lib/constants_borg deleted file mode 120000 index c4c8e4e..0000000 --- a/testing/scripts/lib/constants_borg +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_borg \ No newline at end of file diff --git a/testing/scripts/lib/constants_borg.sh b/testing/scripts/lib/constants_borg.sh new file mode 120000 index 0000000..ea372f2 --- /dev/null +++ b/testing/scripts/lib/constants_borg.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_borg.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_etc b/testing/scripts/lib/constants_etc deleted file mode 120000 index a2af76e..0000000 --- a/testing/scripts/lib/constants_etc +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_etc \ No newline at end of file diff --git a/testing/scripts/lib/constants_etc.sh b/testing/scripts/lib/constants_etc.sh new file mode 120000 index 0000000..0804605 --- /dev/null +++ b/testing/scripts/lib/constants_etc.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_etc.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_finished b/testing/scripts/lib/constants_finished deleted file mode 120000 index 0ece9e9..0000000 --- a/testing/scripts/lib/constants_finished +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_finished \ No newline at end of file diff --git a/testing/scripts/lib/constants_finished.sh b/testing/scripts/lib/constants_finished.sh new file mode 120000 index 0000000..a368711 --- /dev/null +++ b/testing/scripts/lib/constants_finished.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_finished.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_installer b/testing/scripts/lib/constants_installer deleted file mode 120000 index e665bda..0000000 --- a/testing/scripts/lib/constants_installer +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_installer \ No newline at end of file diff --git a/testing/scripts/lib/constants_installer.sh b/testing/scripts/lib/constants_installer.sh new file mode 120000 index 0000000..21dadcc --- /dev/null +++ b/testing/scripts/lib/constants_installer.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_installer.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_repopaths b/testing/scripts/lib/constants_repopaths deleted file mode 120000 index c9d7aa0..0000000 --- a/testing/scripts/lib/constants_repopaths +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_repopaths \ No newline at end of file diff --git a/testing/scripts/lib/constants_repopaths.sh b/testing/scripts/lib/constants_repopaths.sh new file mode 120000 index 0000000..da7a778 --- /dev/null +++ b/testing/scripts/lib/constants_repopaths.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_repopaths.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_secrets b/testing/scripts/lib/constants_secrets deleted file mode 120000 index cc75532..0000000 --- a/testing/scripts/lib/constants_secrets +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_secrets \ No newline at end of file diff --git a/testing/scripts/lib/constants_secrets.sh b/testing/scripts/lib/constants_secrets.sh new file mode 120000 index 0000000..aa933e5 --- /dev/null +++ b/testing/scripts/lib/constants_secrets.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_secrets.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_seedbox b/testing/scripts/lib/constants_seedbox deleted file mode 120000 index 0798f6b..0000000 --- a/testing/scripts/lib/constants_seedbox +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_seedbox \ No newline at end of file diff --git a/testing/scripts/lib/constants_seedbox.sh b/testing/scripts/lib/constants_seedbox.sh new file mode 120000 index 0000000..ef75dd5 --- /dev/null +++ b/testing/scripts/lib/constants_seedbox.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_seedbox.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_ssh b/testing/scripts/lib/constants_ssh deleted file mode 120000 index 53f0a7e..0000000 --- a/testing/scripts/lib/constants_ssh +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_ssh \ No newline at end of file diff --git a/testing/scripts/lib/constants_ssh.sh b/testing/scripts/lib/constants_ssh.sh new file mode 120000 index 0000000..70a1581 --- /dev/null +++ b/testing/scripts/lib/constants_ssh.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_ssh.sh \ No newline at end of file diff --git a/testing/scripts/lib/constants_user b/testing/scripts/lib/constants_user deleted file mode 120000 index 3f1f618..0000000 --- a/testing/scripts/lib/constants_user +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/constants_user \ No newline at end of file diff --git a/testing/scripts/lib/constants_user.sh b/testing/scripts/lib/constants_user.sh new file mode 120000 index 0000000..7e7e14c --- /dev/null +++ b/testing/scripts/lib/constants_user.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/constants_user.sh \ No newline at end of file diff --git a/testing/scripts/lib/copy_and_unmount_secrets b/testing/scripts/lib/copy_and_unmount_secrets deleted file mode 120000 index 901c52f..0000000 --- a/testing/scripts/lib/copy_and_unmount_secrets +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/copy_and_unmount_secrets \ No newline at end of file diff --git a/testing/scripts/lib/copy_and_unmount_secrets.sh b/testing/scripts/lib/copy_and_unmount_secrets.sh new file mode 120000 index 0000000..ee631bd --- /dev/null +++ b/testing/scripts/lib/copy_and_unmount_secrets.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/copy_and_unmount_secrets.sh \ No newline at end of file diff --git a/testing/scripts/lib/copy_dirtrees_of_tags b/testing/scripts/lib/copy_dirtrees_of_tags deleted file mode 120000 index c8af1dd..0000000 --- a/testing/scripts/lib/copy_dirtrees_of_tags +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/copy_dirtrees_of_tags \ No newline at end of file diff --git a/testing/scripts/lib/copy_dirtrees_of_tags.sh b/testing/scripts/lib/copy_dirtrees_of_tags.sh new file mode 120000 index 0000000..727758d --- /dev/null +++ b/testing/scripts/lib/copy_dirtrees_of_tags.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/copy_dirtrees_of_tags.sh \ No newline at end of file diff --git a/testing/scripts/lib/core_setup b/testing/scripts/lib/core_setup deleted file mode 120000 index 57b9805..0000000 --- a/testing/scripts/lib/core_setup +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/core_setup \ No newline at end of file diff --git a/testing/scripts/lib/core_setup.sh b/testing/scripts/lib/core_setup.sh new file mode 120000 index 0000000..100849a --- /dev/null +++ b/testing/scripts/lib/core_setup.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/core_setup.sh \ No newline at end of file diff --git a/testing/scripts/lib/ensure_packages_of_tags b/testing/scripts/lib/ensure_packages_of_tags deleted file mode 120000 index 220fdda..0000000 --- a/testing/scripts/lib/ensure_packages_of_tags +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/ensure_packages_of_tags \ No newline at end of file diff --git a/testing/scripts/lib/ensure_packages_of_tags.sh b/testing/scripts/lib/ensure_packages_of_tags.sh new file mode 120000 index 0000000..db727bd --- /dev/null +++ b/testing/scripts/lib/ensure_packages_of_tags.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/ensure_packages_of_tags.sh \ No newline at end of file diff --git a/testing/scripts/lib/expect_n_args b/testing/scripts/lib/expect_n_args deleted file mode 120000 index 9ec786a..0000000 --- a/testing/scripts/lib/expect_n_args +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/expect_n_args \ No newline at end of file diff --git a/testing/scripts/lib/expect_n_args.sh b/testing/scripts/lib/expect_n_args.sh new file mode 120000 index 0000000..31411d1 --- /dev/null +++ b/testing/scripts/lib/expect_n_args.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/expect_n_args.sh \ No newline at end of file diff --git a/testing/scripts/lib/expected_rtorrent_files b/testing/scripts/lib/expected_rtorrent_files deleted file mode 120000 index 74450e3..0000000 --- a/testing/scripts/lib/expected_rtorrent_files +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/expected_rtorrent_files \ No newline at end of file diff --git a/testing/scripts/lib/expected_rtorrent_files.sh b/testing/scripts/lib/expected_rtorrent_files.sh new file mode 120000 index 0000000..b05902d --- /dev/null +++ b/testing/scripts/lib/expected_rtorrent_files.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/expected_rtorrent_files.sh \ No newline at end of file diff --git a/testing/scripts/lib/for_line_in b/testing/scripts/lib/for_line_in deleted file mode 120000 index 9d87670..0000000 --- a/testing/scripts/lib/for_line_in +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/for_line_in \ No newline at end of file diff --git a/testing/scripts/lib/for_line_in.sh b/testing/scripts/lib/for_line_in.sh new file mode 120000 index 0000000..7f7c100 --- /dev/null +++ b/testing/scripts/lib/for_line_in.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/for_line_in.sh \ No newline at end of file diff --git a/testing/scripts/lib/get_mountable_device_path b/testing/scripts/lib/get_mountable_device_path deleted file mode 120000 index 15645f9..0000000 --- a/testing/scripts/lib/get_mountable_device_path +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/get_mountable_device_path \ No newline at end of file diff --git a/testing/scripts/lib/get_mountable_device_path.sh b/testing/scripts/lib/get_mountable_device_path.sh new file mode 120000 index 0000000..9f0d880 --- /dev/null +++ b/testing/scripts/lib/get_mountable_device_path.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/get_mountable_device_path.sh \ No newline at end of file diff --git a/testing/scripts/lib/get_passphrase b/testing/scripts/lib/get_passphrase deleted file mode 120000 index f38d6ac..0000000 --- a/testing/scripts/lib/get_passphrase +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/get_passphrase \ No newline at end of file diff --git a/testing/scripts/lib/get_passphrase.sh b/testing/scripts/lib/get_passphrase.sh new file mode 120000 index 0000000..9ce20cf --- /dev/null +++ b/testing/scripts/lib/get_passphrase.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/get_passphrase.sh \ No newline at end of file diff --git a/testing/scripts/lib/mount_secrets b/testing/scripts/lib/mount_secrets deleted file mode 120000 index d358809..0000000 --- a/testing/scripts/lib/mount_secrets +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/mount_secrets \ No newline at end of file diff --git a/testing/scripts/lib/mount_secrets.sh b/testing/scripts/lib/mount_secrets.sh new file mode 120000 index 0000000..3f9b11d --- /dev/null +++ b/testing/scripts/lib/mount_secrets.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/mount_secrets.sh \ No newline at end of file diff --git a/testing/scripts/lib/path_tmp_timestamped b/testing/scripts/lib/path_tmp_timestamped deleted file mode 120000 index a7ae07c..0000000 --- a/testing/scripts/lib/path_tmp_timestamped +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/path_tmp_timestamped \ No newline at end of file diff --git a/testing/scripts/lib/path_tmp_timestamped.sh b/testing/scripts/lib/path_tmp_timestamped.sh new file mode 120000 index 0000000..00b9990 --- /dev/null +++ b/testing/scripts/lib/path_tmp_timestamped.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/path_tmp_timestamped.sh \ No newline at end of file diff --git a/testing/scripts/lib/prefixed_msg b/testing/scripts/lib/prefixed_msg deleted file mode 120000 index 713bd58..0000000 --- a/testing/scripts/lib/prefixed_msg +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/prefixed_msg \ No newline at end of file diff --git a/testing/scripts/lib/prefixed_msg.sh b/testing/scripts/lib/prefixed_msg.sh new file mode 120000 index 0000000..9d81897 --- /dev/null +++ b/testing/scripts/lib/prefixed_msg.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/prefixed_msg.sh \ No newline at end of file diff --git a/testing/scripts/lib/put_finished_marker b/testing/scripts/lib/put_finished_marker deleted file mode 120000 index 8f3439a..0000000 --- a/testing/scripts/lib/put_finished_marker +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/put_finished_marker \ No newline at end of file diff --git a/testing/scripts/lib/put_finished_marker.sh b/testing/scripts/lib/put_finished_marker.sh new file mode 120000 index 0000000..dda5340 --- /dev/null +++ b/testing/scripts/lib/put_finished_marker.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/put_finished_marker.sh \ No newline at end of file diff --git a/testing/scripts/lib/retry_until b/testing/scripts/lib/retry_until deleted file mode 120000 index 0b0c894..0000000 --- a/testing/scripts/lib/retry_until +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/retry_until \ No newline at end of file diff --git a/testing/scripts/lib/retry_until.sh b/testing/scripts/lib/retry_until.sh new file mode 120000 index 0000000..296627b --- /dev/null +++ b/testing/scripts/lib/retry_until.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/retry_until.sh \ No newline at end of file diff --git a/testing/scripts/lib/tagdir_parsing b/testing/scripts/lib/tagdir_parsing deleted file mode 120000 index 200a36f..0000000 --- a/testing/scripts/lib/tagdir_parsing +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/tagdir_parsing \ No newline at end of file diff --git a/testing/scripts/lib/tagdir_parsing.sh b/testing/scripts/lib/tagdir_parsing.sh new file mode 120000 index 0000000..69297e7 --- /dev/null +++ b/testing/scripts/lib/tagdir_parsing.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/tagdir_parsing.sh \ No newline at end of file diff --git a/testing/scripts/lib/trapp b/testing/scripts/lib/trapp deleted file mode 120000 index c9180a7..0000000 --- a/testing/scripts/lib/trapp +++ /dev/null @@ -1 +0,0 @@ -../../../trixie/scripts/lib/trapp \ No newline at end of file diff --git a/testing/scripts/lib/trapp.sh b/testing/scripts/lib/trapp.sh new file mode 120000 index 0000000..64770e1 --- /dev/null +++ b/testing/scripts/lib/trapp.sh @@ -0,0 +1 @@ +../../../trixie/scripts/lib/trapp.sh \ No newline at end of file diff --git a/testing/scripts/pull_catgirl_logs.sh b/testing/scripts/pull_catgirl_logs.sh index 443c793..e760b4c 100755 --- a/testing/scripts/pull_catgirl_logs.sh +++ b/testing/scripts/pull_catgirl_logs.sh @@ -1,13 +1,13 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/abort_if_command_unknown -. lib/abort_if_offline -. lib/constants_ssh # PATH_USER_SSH -. lib/expect_n_args -. lib/path_tmp_timestamped -. lib/prefixed_msg -. lib/trapp +. lib/abort_if_command_unknown.sh +. lib/abort_if_offline.sh +. lib/constants_ssh.sh # PATH_USER_SSH +. lib/expect_n_args.sh +. lib/path_tmp_timestamped.sh +. lib/prefixed_msg.sh +. lib/trapp.sh prefixed_msg_init diff --git a/testing/scripts/sync_rtorrent_download.sh b/testing/scripts/sync_rtorrent_download.sh index 52cdbb7..3c5aadb 100755 --- a/testing/scripts/sync_rtorrent_download.sh +++ b/testing/scripts/sync_rtorrent_download.sh @@ -1,14 +1,14 @@ #!/bin/sh set -eC cd $(dirname "$0") -. lib/abort -. lib/abort_if_exists -. lib/abort_if_offline -. lib/constants_seedbox -. lib/expect_n_args -. lib/expected_rtorrent_files -. lib/for_line_in -. lib/trapp +. lib/abort.sh +. lib/abort_if_exists.sh +. lib/abort_if_offline.sh +. lib/constants_seedbox.sh +. lib/expect_n_args.sh +. lib/expected_rtorrent_files.sh +. lib/for_line_in.sh +. lib/trapp.sh cd - > /dev/null DIRNAME_DOWNLOAD='download' diff --git a/trixie/copy/desktop/home/plom/.plomlib/abort b/trixie/copy/desktop/home/plom/.plomlib/abort deleted file mode 120000 index 1fa89a1..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/abort +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/abort \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/abort.sh b/trixie/copy/desktop/home/plom/.plomlib/abort.sh new file mode 120000 index 0000000..45aefdb --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/abort.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/abort.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/abort_if_exists b/trixie/copy/desktop/home/plom/.plomlib/abort_if_exists deleted file mode 120000 index 2c89f91..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/abort_if_exists +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/abort_if_exists \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/abort_if_exists.sh b/trixie/copy/desktop/home/plom/.plomlib/abort_if_exists.sh new file mode 120000 index 0000000..038c42c --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/abort_if_exists.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/abort_if_exists.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/audio_dev_is_mute b/trixie/copy/desktop/home/plom/.plomlib/audio_dev_is_mute.sh similarity index 100% rename from trixie/copy/desktop/home/plom/.plomlib/audio_dev_is_mute rename to trixie/copy/desktop/home/plom/.plomlib/audio_dev_is_mute.sh diff --git a/trixie/copy/desktop/home/plom/.plomlib/constants_borg b/trixie/copy/desktop/home/plom/.plomlib/constants_borg deleted file mode 120000 index 11fd28a..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/constants_borg +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/constants_borg \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/constants_borg.sh b/trixie/copy/desktop/home/plom/.plomlib/constants_borg.sh new file mode 120000 index 0000000..72e1188 --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/constants_borg.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/constants_borg.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/constants_secrets b/trixie/copy/desktop/home/plom/.plomlib/constants_secrets deleted file mode 120000 index c44c50b..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/constants_secrets +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/constants_secrets \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/constants_secrets.sh b/trixie/copy/desktop/home/plom/.plomlib/constants_secrets.sh new file mode 120000 index 0000000..66f96c9 --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/constants_secrets.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/constants_secrets.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/constants_ssh b/trixie/copy/desktop/home/plom/.plomlib/constants_ssh deleted file mode 120000 index edc00a7..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/constants_ssh +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/constants_ssh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/constants_ssh.sh b/trixie/copy/desktop/home/plom/.plomlib/constants_ssh.sh new file mode 120000 index 0000000..fedda73 --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/constants_ssh.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/constants_ssh.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/constants_user b/trixie/copy/desktop/home/plom/.plomlib/constants_user deleted file mode 120000 index 6aa6571..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/constants_user +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/constants_user \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/constants_user.sh b/trixie/copy/desktop/home/plom/.plomlib/constants_user.sh new file mode 120000 index 0000000..dc8c43e --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/constants_user.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/constants_user.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/copy_and_unmount_secrets b/trixie/copy/desktop/home/plom/.plomlib/copy_and_unmount_secrets deleted file mode 120000 index c215403..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/copy_and_unmount_secrets +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/copy_and_unmount_secrets \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/copy_and_unmount_secrets.sh b/trixie/copy/desktop/home/plom/.plomlib/copy_and_unmount_secrets.sh new file mode 120000 index 0000000..22162a6 --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/copy_and_unmount_secrets.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/copy_and_unmount_secrets.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/expect_n_args b/trixie/copy/desktop/home/plom/.plomlib/expect_n_args deleted file mode 120000 index eddbca9..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/expect_n_args +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/expect_n_args \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/expect_n_args.sh b/trixie/copy/desktop/home/plom/.plomlib/expect_n_args.sh new file mode 120000 index 0000000..9582f5f --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/expect_n_args.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/expect_n_args.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/get_passphrase b/trixie/copy/desktop/home/plom/.plomlib/get_passphrase deleted file mode 120000 index e7d3829..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/get_passphrase +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/get_passphrase \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/get_passphrase.sh b/trixie/copy/desktop/home/plom/.plomlib/get_passphrase.sh new file mode 120000 index 0000000..72c1166 --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/get_passphrase.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/get_passphrase.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/mount_secrets b/trixie/copy/desktop/home/plom/.plomlib/mount_secrets deleted file mode 120000 index 62637a7..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/mount_secrets +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/mount_secrets \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/mount_secrets.sh b/trixie/copy/desktop/home/plom/.plomlib/mount_secrets.sh new file mode 120000 index 0000000..5cff252 --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/mount_secrets.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/mount_secrets.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/path_tmp_timestamped b/trixie/copy/desktop/home/plom/.plomlib/path_tmp_timestamped deleted file mode 120000 index 85c7c4b..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/path_tmp_timestamped +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/path_tmp_timestamped \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/path_tmp_timestamped.sh b/trixie/copy/desktop/home/plom/.plomlib/path_tmp_timestamped.sh new file mode 120000 index 0000000..42e3708 --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/path_tmp_timestamped.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/path_tmp_timestamped.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/prefixed_msg b/trixie/copy/desktop/home/plom/.plomlib/prefixed_msg deleted file mode 120000 index 42ff428..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/prefixed_msg +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/prefixed_msg \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/prefixed_msg.sh b/trixie/copy/desktop/home/plom/.plomlib/prefixed_msg.sh new file mode 120000 index 0000000..e9c316f --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/prefixed_msg.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/prefixed_msg.sh \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/print_usage b/trixie/copy/desktop/home/plom/.plomlib/print_usage.sh similarity index 100% rename from trixie/copy/desktop/home/plom/.plomlib/print_usage rename to trixie/copy/desktop/home/plom/.plomlib/print_usage.sh diff --git a/trixie/copy/desktop/home/plom/.plomlib/retry_until b/trixie/copy/desktop/home/plom/.plomlib/retry_until deleted file mode 120000 index 5fa5898..0000000 --- a/trixie/copy/desktop/home/plom/.plomlib/retry_until +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/lib/retry_until \ No newline at end of file diff --git a/trixie/copy/desktop/home/plom/.plomlib/retry_until.sh b/trixie/copy/desktop/home/plom/.plomlib/retry_until.sh new file mode 120000 index 0000000..ba73472 --- /dev/null +++ b/trixie/copy/desktop/home/plom/.plomlib/retry_until.sh @@ -0,0 +1 @@ +../../../../../scripts/lib/retry_until.sh \ No newline at end of file diff --git a/trixie/scripts/_setup_secrets_user.sh b/trixie/scripts/_setup_secrets_user.sh index 60fc651..fc95d2d 100644 --- a/trixie/scripts/_setup_secrets_user.sh +++ b/trixie/scripts/_setup_secrets_user.sh @@ -1,20 +1,20 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/abort +. lib/abort.sh # . lib/abort_if_exists -. lib/abort_if_not_user -. lib/abort_if_offline +. lib/abort_if_not_user.sh +. lib/abort_if_offline.sh # . lib/constants_secrets # PATH_SECRETS, PATH_SECRETS_KDBX, PATH_SECRETS_SSH, PATH_SECRETS_BORGKEYS, PATH_USER_KDBX -. lib/constants_ssh # PATH_USER_SSH -. lib/constants_user # USERNAME +. lib/constants_ssh.sh # PATH_USER_SSH +. lib/constants_user.sh # USERNAME # . lib/constants_borg # NAME_BORGAPP # . lib/copy_and_unmount_secrets -. lib/expect_n_args +. lib/expect_n_args.sh # . lib/mount_secrets -. lib/prefixed_msg +. lib/prefixed_msg.sh # . lib/retry_until -. lib/trapp +. lib/trapp.sh prefixed_msg_init PATH_REPOS="${HOME}/repos" diff --git a/trixie/scripts/from_older_upgrade.sh b/trixie/scripts/from_older_upgrade.sh index 89b8a49..d699318 100755 --- a/trixie/scripts/from_older_upgrade.sh +++ b/trixie/scripts/from_older_upgrade.sh @@ -1,13 +1,13 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/abort -. lib/apt_get_digested -. lib/constants_etc # PATH_ETC -. lib/constants_releases # PREV_RELEASE, THIS_RELEASE -. lib/expect_n_args -. lib/prefixed_msg -. lib/tagdir_parsing +. lib/abort.sh +. lib/apt_get_digested.sh +. lib/constants_etc.sh # PATH_ETC +. lib/constants_releases.sh # PREV_RELEASE, THIS_RELEASE +. lib/expect_n_args.sh +. lib/prefixed_msg.sh +. lib/tagdir_parsing.sh prefixed_msg_init MSG_ALLOWED_INSTALLATION_TYPES='either "server" or "desktop"' diff --git a/trixie/scripts/lib/INSTALLER_VERSION b/trixie/scripts/lib/INSTALLER_VERSION.sh similarity index 100% rename from trixie/scripts/lib/INSTALLER_VERSION rename to trixie/scripts/lib/INSTALLER_VERSION.sh diff --git a/trixie/scripts/lib/abort b/trixie/scripts/lib/abort deleted file mode 120000 index 5574233..0000000 --- a/trixie/scripts/lib/abort +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/abort \ No newline at end of file diff --git a/trixie/scripts/lib/abort.sh b/trixie/scripts/lib/abort.sh new file mode 120000 index 0000000..ccda89b --- /dev/null +++ b/trixie/scripts/lib/abort.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/abort.sh \ No newline at end of file diff --git a/trixie/scripts/lib/abort_if_command_unknown b/trixie/scripts/lib/abort_if_command_unknown deleted file mode 120000 index 5d77154..0000000 --- a/trixie/scripts/lib/abort_if_command_unknown +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/abort_if_command_unknown \ No newline at end of file diff --git a/trixie/scripts/lib/abort_if_command_unknown.sh b/trixie/scripts/lib/abort_if_command_unknown.sh new file mode 120000 index 0000000..eba2ad9 --- /dev/null +++ b/trixie/scripts/lib/abort_if_command_unknown.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/abort_if_command_unknown.sh \ No newline at end of file diff --git a/trixie/scripts/lib/abort_if_exists b/trixie/scripts/lib/abort_if_exists.sh similarity index 87% rename from trixie/scripts/lib/abort_if_exists rename to trixie/scripts/lib/abort_if_exists.sh index 33f49d5..21e1eee 100644 --- a/trixie/scripts/lib/abort_if_exists +++ b/trixie/scripts/lib/abort_if_exists.sh @@ -1,4 +1,4 @@ -. lib/abort +. lib/abort.sh abort_if_exists() { if [ -e "$1" ]; then diff --git a/trixie/scripts/lib/abort_if_not_user b/trixie/scripts/lib/abort_if_not_user deleted file mode 120000 index b152dca..0000000 --- a/trixie/scripts/lib/abort_if_not_user +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/abort_if_not_user \ No newline at end of file diff --git a/trixie/scripts/lib/abort_if_not_user.sh b/trixie/scripts/lib/abort_if_not_user.sh new file mode 120000 index 0000000..04fab98 --- /dev/null +++ b/trixie/scripts/lib/abort_if_not_user.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/abort_if_not_user.sh \ No newline at end of file diff --git a/trixie/scripts/lib/abort_if_offline b/trixie/scripts/lib/abort_if_offline.sh similarity index 88% rename from trixie/scripts/lib/abort_if_offline rename to trixie/scripts/lib/abort_if_offline.sh index b81c784..7a8f6ac 100644 --- a/trixie/scripts/lib/abort_if_offline +++ b/trixie/scripts/lib/abort_if_offline.sh @@ -1,4 +1,4 @@ -. lib/abort +. lib/abort.sh abort_if_offline() { if ! ping -c1 -W2 1.1.1.1 > /dev/null 2>&1; then diff --git a/trixie/scripts/lib/apt_get_digested b/trixie/scripts/lib/apt_get_digested deleted file mode 120000 index 939b040..0000000 --- a/trixie/scripts/lib/apt_get_digested +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/apt_get_digested \ No newline at end of file diff --git a/trixie/scripts/lib/apt_get_digested.sh b/trixie/scripts/lib/apt_get_digested.sh new file mode 120000 index 0000000..f797993 --- /dev/null +++ b/trixie/scripts/lib/apt_get_digested.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/apt_get_digested.sh \ No newline at end of file diff --git a/trixie/scripts/lib/check_finished_marker b/trixie/scripts/lib/check_finished_marker deleted file mode 120000 index d8daf8f..0000000 --- a/trixie/scripts/lib/check_finished_marker +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/check_finished_marker \ No newline at end of file diff --git a/trixie/scripts/lib/check_finished_marker.sh b/trixie/scripts/lib/check_finished_marker.sh new file mode 120000 index 0000000..1f6e673 --- /dev/null +++ b/trixie/scripts/lib/check_finished_marker.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/check_finished_marker.sh \ No newline at end of file diff --git a/trixie/scripts/lib/constants_borg b/trixie/scripts/lib/constants_borg.sh similarity index 100% rename from trixie/scripts/lib/constants_borg rename to trixie/scripts/lib/constants_borg.sh diff --git a/trixie/scripts/lib/constants_etc b/trixie/scripts/lib/constants_etc deleted file mode 120000 index 5c4073f..0000000 --- a/trixie/scripts/lib/constants_etc +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/constants_etc \ No newline at end of file diff --git a/trixie/scripts/lib/constants_etc.sh b/trixie/scripts/lib/constants_etc.sh new file mode 120000 index 0000000..c442dc5 --- /dev/null +++ b/trixie/scripts/lib/constants_etc.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/constants_etc.sh \ No newline at end of file diff --git a/trixie/scripts/lib/constants_finished b/trixie/scripts/lib/constants_finished deleted file mode 120000 index ec93895..0000000 --- a/trixie/scripts/lib/constants_finished +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/constants_finished \ No newline at end of file diff --git a/trixie/scripts/lib/constants_finished.sh b/trixie/scripts/lib/constants_finished.sh new file mode 120000 index 0000000..dc95266 --- /dev/null +++ b/trixie/scripts/lib/constants_finished.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/constants_finished.sh \ No newline at end of file diff --git a/trixie/scripts/lib/constants_installer b/trixie/scripts/lib/constants_installer.sh similarity index 100% rename from trixie/scripts/lib/constants_installer rename to trixie/scripts/lib/constants_installer.sh diff --git a/trixie/scripts/lib/constants_releases b/trixie/scripts/lib/constants_releases.sh similarity index 100% rename from trixie/scripts/lib/constants_releases rename to trixie/scripts/lib/constants_releases.sh diff --git a/trixie/scripts/lib/constants_repopaths b/trixie/scripts/lib/constants_repopaths deleted file mode 120000 index d796f1c..0000000 --- a/trixie/scripts/lib/constants_repopaths +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/constants_repopaths \ No newline at end of file diff --git a/trixie/scripts/lib/constants_repopaths.sh b/trixie/scripts/lib/constants_repopaths.sh new file mode 120000 index 0000000..5072dd0 --- /dev/null +++ b/trixie/scripts/lib/constants_repopaths.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/constants_repopaths.sh \ No newline at end of file diff --git a/trixie/scripts/lib/constants_secrets b/trixie/scripts/lib/constants_secrets.sh similarity index 93% rename from trixie/scripts/lib/constants_secrets rename to trixie/scripts/lib/constants_secrets.sh index 9b0cf7e..4b19a02 100644 --- a/trixie/scripts/lib/constants_secrets +++ b/trixie/scripts/lib/constants_secrets.sh @@ -1,4 +1,4 @@ -. lib/constants_user +. lib/constants_user.sh PATH_MEDIA=/media PATH_REL_SECRETS=.secrets PATH_SECRETS="${PATH_USER_HOME}/${PATH_REL_SECRETS}" diff --git a/trixie/scripts/lib/constants_seedbox b/trixie/scripts/lib/constants_seedbox deleted file mode 120000 index 2b5a74d..0000000 --- a/trixie/scripts/lib/constants_seedbox +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/constants_seedbox \ No newline at end of file diff --git a/trixie/scripts/lib/constants_seedbox.sh b/trixie/scripts/lib/constants_seedbox.sh new file mode 120000 index 0000000..cd89783 --- /dev/null +++ b/trixie/scripts/lib/constants_seedbox.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/constants_seedbox.sh \ No newline at end of file diff --git a/trixie/scripts/lib/constants_ssh b/trixie/scripts/lib/constants_ssh deleted file mode 120000 index b711025..0000000 --- a/trixie/scripts/lib/constants_ssh +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/constants_ssh \ No newline at end of file diff --git a/trixie/scripts/lib/constants_ssh.sh b/trixie/scripts/lib/constants_ssh.sh new file mode 120000 index 0000000..aab9999 --- /dev/null +++ b/trixie/scripts/lib/constants_ssh.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/constants_ssh.sh \ No newline at end of file diff --git a/trixie/scripts/lib/constants_user b/trixie/scripts/lib/constants_user deleted file mode 120000 index 1e15899..0000000 --- a/trixie/scripts/lib/constants_user +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/constants_user \ No newline at end of file diff --git a/trixie/scripts/lib/constants_user.sh b/trixie/scripts/lib/constants_user.sh new file mode 120000 index 0000000..62c24f1 --- /dev/null +++ b/trixie/scripts/lib/constants_user.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/constants_user.sh \ No newline at end of file diff --git a/trixie/scripts/lib/copy_and_unmount_secrets b/trixie/scripts/lib/copy_and_unmount_secrets.sh similarity index 88% rename from trixie/scripts/lib/copy_and_unmount_secrets rename to trixie/scripts/lib/copy_and_unmount_secrets.sh index 8d203c9..6a29ebe 100644 --- a/trixie/scripts/lib/copy_and_unmount_secrets +++ b/trixie/scripts/lib/copy_and_unmount_secrets.sh @@ -1,4 +1,4 @@ -. lib/constants_secrets # PATH_REL_SECRETS, PATH_SECRETS +. lib/constants_secrets.sh # PATH_REL_SECRETS, PATH_SECRETS copy_and_unmount_secrets() { prefixed_msg_init copy_and_unmount_secrets diff --git a/trixie/scripts/lib/copy_dirtrees_of_tags b/trixie/scripts/lib/copy_dirtrees_of_tags deleted file mode 120000 index d33a150..0000000 --- a/trixie/scripts/lib/copy_dirtrees_of_tags +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/copy_dirtrees_of_tags \ No newline at end of file diff --git a/trixie/scripts/lib/copy_dirtrees_of_tags.sh b/trixie/scripts/lib/copy_dirtrees_of_tags.sh new file mode 120000 index 0000000..3198848 --- /dev/null +++ b/trixie/scripts/lib/copy_dirtrees_of_tags.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/copy_dirtrees_of_tags.sh \ No newline at end of file diff --git a/trixie/scripts/lib/core_setup b/trixie/scripts/lib/core_setup deleted file mode 120000 index 74ac2dd..0000000 --- a/trixie/scripts/lib/core_setup +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/core_setup \ No newline at end of file diff --git a/trixie/scripts/lib/core_setup.sh b/trixie/scripts/lib/core_setup.sh new file mode 120000 index 0000000..da497f2 --- /dev/null +++ b/trixie/scripts/lib/core_setup.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/core_setup.sh \ No newline at end of file diff --git a/trixie/scripts/lib/ensure_packages_of_tags b/trixie/scripts/lib/ensure_packages_of_tags deleted file mode 120000 index 3c5fdf5..0000000 --- a/trixie/scripts/lib/ensure_packages_of_tags +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/ensure_packages_of_tags \ No newline at end of file diff --git a/trixie/scripts/lib/ensure_packages_of_tags.sh b/trixie/scripts/lib/ensure_packages_of_tags.sh new file mode 120000 index 0000000..ca07505 --- /dev/null +++ b/trixie/scripts/lib/ensure_packages_of_tags.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/ensure_packages_of_tags.sh \ No newline at end of file diff --git a/trixie/scripts/lib/expect_n_args b/trixie/scripts/lib/expect_n_args deleted file mode 120000 index 5c37e82..0000000 --- a/trixie/scripts/lib/expect_n_args +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/expect_n_args \ No newline at end of file diff --git a/trixie/scripts/lib/expect_n_args.sh b/trixie/scripts/lib/expect_n_args.sh new file mode 120000 index 0000000..7430ba5 --- /dev/null +++ b/trixie/scripts/lib/expect_n_args.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/expect_n_args.sh \ No newline at end of file diff --git a/trixie/scripts/lib/expected_rtorrent_files b/trixie/scripts/lib/expected_rtorrent_files deleted file mode 120000 index 04bc8a5..0000000 --- a/trixie/scripts/lib/expected_rtorrent_files +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/expected_rtorrent_files \ No newline at end of file diff --git a/trixie/scripts/lib/expected_rtorrent_files.sh b/trixie/scripts/lib/expected_rtorrent_files.sh new file mode 120000 index 0000000..3b830e9 --- /dev/null +++ b/trixie/scripts/lib/expected_rtorrent_files.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/expected_rtorrent_files.sh \ No newline at end of file diff --git a/trixie/scripts/lib/for_line_in b/trixie/scripts/lib/for_line_in deleted file mode 120000 index be20aa1..0000000 --- a/trixie/scripts/lib/for_line_in +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/for_line_in \ No newline at end of file diff --git a/trixie/scripts/lib/for_line_in.sh b/trixie/scripts/lib/for_line_in.sh new file mode 120000 index 0000000..08d5094 --- /dev/null +++ b/trixie/scripts/lib/for_line_in.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/for_line_in.sh \ No newline at end of file diff --git a/trixie/scripts/lib/get_mountable_device_path b/trixie/scripts/lib/get_mountable_device_path.sh similarity index 95% rename from trixie/scripts/lib/get_mountable_device_path rename to trixie/scripts/lib/get_mountable_device_path.sh index b0a1cd5..8af2a89 100644 --- a/trixie/scripts/lib/get_mountable_device_path +++ b/trixie/scripts/lib/get_mountable_device_path.sh @@ -1,4 +1,4 @@ -. lib/abort +. lib/abort.sh get_mountable_device_path() { _PATH_DEV="/dev/$1" diff --git a/trixie/scripts/lib/get_passphrase b/trixie/scripts/lib/get_passphrase.sh similarity index 100% rename from trixie/scripts/lib/get_passphrase rename to trixie/scripts/lib/get_passphrase.sh diff --git a/trixie/scripts/lib/install_tags b/trixie/scripts/lib/install_tags deleted file mode 120000 index e205175..0000000 --- a/trixie/scripts/lib/install_tags +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/install_tags \ No newline at end of file diff --git a/trixie/scripts/lib/install_tags.sh b/trixie/scripts/lib/install_tags.sh new file mode 120000 index 0000000..965dd4a --- /dev/null +++ b/trixie/scripts/lib/install_tags.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/install_tags.sh \ No newline at end of file diff --git a/trixie/scripts/lib/mount_secrets b/trixie/scripts/lib/mount_secrets.sh similarity index 80% rename from trixie/scripts/lib/mount_secrets rename to trixie/scripts/lib/mount_secrets.sh index 7012dab..679d4c2 100644 --- a/trixie/scripts/lib/mount_secrets +++ b/trixie/scripts/lib/mount_secrets.sh @@ -1,9 +1,9 @@ -. lib/constants_secrets # PATH_MEDIA, PATH_REL_SECRETS -. lib/expect_n_args -. lib/get_passphrase -. lib/path_tmp_timestamped -. lib/prefixed_msg -. lib/retry_until +. lib/constants_secrets.sh # PATH_MEDIA, PATH_REL_SECRETS +. lib/expect_n_args.sh +. lib/get_passphrase.sh +. lib/path_tmp_timestamped.sh +. lib/prefixed_msg.sh +. lib/retry_until.sh mount_secrets() { prefixed_msg_init mount_secrets diff --git a/trixie/scripts/lib/path_tmp_timestamped b/trixie/scripts/lib/path_tmp_timestamped.sh similarity index 100% rename from trixie/scripts/lib/path_tmp_timestamped rename to trixie/scripts/lib/path_tmp_timestamped.sh diff --git a/trixie/scripts/lib/prefixed_msg b/trixie/scripts/lib/prefixed_msg deleted file mode 120000 index 2caf5d7..0000000 --- a/trixie/scripts/lib/prefixed_msg +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/prefixed_msg \ No newline at end of file diff --git a/trixie/scripts/lib/prefixed_msg.sh b/trixie/scripts/lib/prefixed_msg.sh new file mode 120000 index 0000000..28dd87f --- /dev/null +++ b/trixie/scripts/lib/prefixed_msg.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/prefixed_msg.sh \ No newline at end of file diff --git a/trixie/scripts/lib/put_finished_marker b/trixie/scripts/lib/put_finished_marker deleted file mode 120000 index 54b6550..0000000 --- a/trixie/scripts/lib/put_finished_marker +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/put_finished_marker \ No newline at end of file diff --git a/trixie/scripts/lib/put_finished_marker.sh b/trixie/scripts/lib/put_finished_marker.sh new file mode 120000 index 0000000..ec16395 --- /dev/null +++ b/trixie/scripts/lib/put_finished_marker.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/put_finished_marker.sh \ No newline at end of file diff --git a/trixie/scripts/lib/retry_until b/trixie/scripts/lib/retry_until.sh similarity index 100% rename from trixie/scripts/lib/retry_until rename to trixie/scripts/lib/retry_until.sh diff --git a/trixie/scripts/lib/tagdir_parsing b/trixie/scripts/lib/tagdir_parsing deleted file mode 120000 index b86b7fa..0000000 --- a/trixie/scripts/lib/tagdir_parsing +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/tagdir_parsing \ No newline at end of file diff --git a/trixie/scripts/lib/tagdir_parsing.sh b/trixie/scripts/lib/tagdir_parsing.sh new file mode 120000 index 0000000..faf7a3c --- /dev/null +++ b/trixie/scripts/lib/tagdir_parsing.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/tagdir_parsing.sh \ No newline at end of file diff --git a/trixie/scripts/lib/trapp b/trixie/scripts/lib/trapp deleted file mode 120000 index 5833d35..0000000 --- a/trixie/scripts/lib/trapp +++ /dev/null @@ -1 +0,0 @@ -../../../bookworm/scripts/lib/trapp \ No newline at end of file diff --git a/trixie/scripts/lib/trapp.sh b/trixie/scripts/lib/trapp.sh new file mode 120000 index 0000000..23d49a5 --- /dev/null +++ b/trixie/scripts/lib/trapp.sh @@ -0,0 +1 @@ +../../../bookworm/scripts/lib/trapp.sh \ No newline at end of file diff --git a/trixie/scripts/make_writable_installer.sh b/trixie/scripts/make_writable_installer.sh index bd04512..dc8dedd 100755 --- a/trixie/scripts/make_writable_installer.sh +++ b/trixie/scripts/make_writable_installer.sh @@ -2,16 +2,16 @@ # based on set -eu cd $(dirname "$0") -. lib/INSTALLER_VERSION -. lib/abort -. lib/abort_if_command_unknown -. lib/abort_if_not_user -. lib/abort_if_offline -. lib/constants_installer # FILENAME_PRESEED_CFG, PATH_PRESEED_CFG -. lib/expect_n_args -. lib/get_mountable_device_path -. lib/path_tmp_timestamped -. lib/trapp +. lib/INSTALLER_VERSION.sh +. lib/abort.sh +. lib/abort_if_command_unknown.sh +. lib/abort_if_not_user.sh +. lib/abort_if_offline.sh +. lib/constants_installer.sh # FILENAME_PRESEED_CFG, PATH_PRESEED_CFG +. lib/expect_n_args.sh +. lib/get_mountable_device_path.sh +. lib/path_tmp_timestamped.sh +. lib/trapp.sh expect_n_args 1 2 'DEVICE (e.g. "sdb") [PATH_FILE_ISO]' $@ abort_if_not_user root diff --git a/trixie/scripts/setup_desktop.sh b/trixie/scripts/setup_desktop.sh index 9e95dae..d4062ba 100755 --- a/trixie/scripts/setup_desktop.sh +++ b/trixie/scripts/setup_desktop.sh @@ -2,16 +2,16 @@ set -eu ROOT=$(dirname "$0") cd "${ROOT}" -. lib/abort -. lib/abort_if_offline -. lib/apt_get_digested -. lib/constants_etc # PATH_ETC -. lib/constants_user # USERNAME -. lib/copy_dirtrees_of_tags -. lib/core_setup -. lib/expect_n_args -. lib/prefixed_msg -. lib/put_finished_marker +. lib/abort.sh +. lib/abort_if_offline.sh +. lib/apt_get_digested.sh +. lib/constants_etc.sh # PATH_ETC +. lib/constants_user.sh # USERNAME +. lib/copy_dirtrees_of_tags.sh +. lib/core_setup.sh +. lib/expect_n_args.sh +. lib/prefixed_msg.sh +. lib/put_finished_marker.sh prefixed_msg_init prefixed_msg 'starting …' diff --git a/trixie/scripts/setup_reform_qemu.sh b/trixie/scripts/setup_reform_qemu.sh index 025f2b8..b2a74cb 100755 --- a/trixie/scripts/setup_reform_qemu.sh +++ b/trixie/scripts/setup_reform_qemu.sh @@ -1,11 +1,11 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/apt_get_digested -. lib/constants_ssh # PATH_REL_SSH, PATH_USER_SSH -. lib/core_setup -. lib/expect_n_args -. lib/prefixed_msg +. lib/apt_get_digested.sh +. lib/constants_ssh.sh # PATH_REL_SSH, PATH_USER_SSH +. lib/core_setup.sh +. lib/expect_n_args.sh +. lib/prefixed_msg.sh prefixed_msg_init prefixed_msg 'starting' diff --git a/trixie/scripts/setup_secrets.sh b/trixie/scripts/setup_secrets.sh index f50ed96..f40f720 100755 --- a/trixie/scripts/setup_secrets.sh +++ b/trixie/scripts/setup_secrets.sh @@ -1,12 +1,12 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/abort_if_not_user -. lib/check_finished_marker -. lib/constants_repopaths # PATH_CONF, PATH_SCRIPTS -. lib/constants_user # USERNAME -. lib/path_tmp_timestamped -. lib/prefixed_msg +. lib/abort_if_not_user.sh +. lib/check_finished_marker.sh +. lib/constants_repopaths.sh # PATH_CONF, PATH_SCRIPTS +. lib/constants_user.sh # USERNAME +. lib/path_tmp_timestamped.sh +. lib/prefixed_msg.sh prefixed_msg_init diff --git a/trixie/scripts/update_preseed.sh b/trixie/scripts/update_preseed.sh index 743bb5c..e23c201 100755 --- a/trixie/scripts/update_preseed.sh +++ b/trixie/scripts/update_preseed.sh @@ -1,12 +1,12 @@ #!/bin/sh set -e cd $(dirname "$0") -. lib/abort_if_command_unknown -. lib/constants_installer # FILENAME_PRESEED_CFG, PATH_PRESEED_CFG -. lib/expect_n_args -. lib/get_mountable_device_path -. lib/prefixed_msg -. lib/trapp +. lib/abort_if_command_unknown.sh +. lib/constants_installer.sh # FILENAME_PRESEED_CFG, PATH_PRESEED_CFG +. lib/expect_n_args.sh +. lib/get_mountable_device_path.sh +. lib/prefixed_msg.sh +. lib/trapp.sh prefixed_msg_init -- 2.30.2