From 65a869aa2c28d985440ab31feeba60d55b343475 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 26 Aug 2025 04:39:17 +0200 Subject: [PATCH] Fix. --- .../copy/desktop/home/plom/.local/bin/setup_secrets | 12 +++++++++--- trixie/scripts/setup_secrets.sh | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/trixie/copy/desktop/home/plom/.local/bin/setup_secrets b/trixie/copy/desktop/home/plom/.local/bin/setup_secrets index d0fb34c..71c20e3 100755 --- a/trixie/copy/desktop/home/plom/.local/bin/setup_secrets +++ b/trixie/copy/desktop/home/plom/.local/bin/setup_secrets @@ -2,16 +2,22 @@ set -e ROOT=$(dirname "$0") cd "${ROOT}" -. lib/abort_if_exists +. lib/abort_if_exists.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_borg.sh # PATH_SECRETS, PATH_SECRETS_KDBX, PATH_SECRETS_SSH, PATH_SECRETS_BORGKEYS, PATH_USER_KDBX +. lib/constants_secrets.sh # PATH_SECRETS, PATH_SECRETS_KDBX, PATH_SECRETS_SSH, PATH_SECRETS_BORGKEYS, PATH_USER_KDBX . lib/constants_ssh.sh # PATH_USER_SSH . lib/constants_user.sh # USERNAME +- lib/copy_and_unmount_secrets.sh . lib/expect_n_args.sh -. lib/retry_until +. lib/mount_secrets.sh +. lib/retry_until.sh . lib/trapp.sh prefixed_msg_init +PATH_REPOS="${HOME}/repos" +REPOS_SITE_DOMAIN=plomlompom.com +REMOTE_PATH_REPOS=/var/repos expect_n_args 1 1 "(device name, e.g. 'sda')" $@ abort_if_offline diff --git a/trixie/scripts/setup_secrets.sh b/trixie/scripts/setup_secrets.sh index f40f720..08ae489 100755 --- a/trixie/scripts/setup_secrets.sh +++ b/trixie/scripts/setup_secrets.sh @@ -1,6 +1,8 @@ #!/bin/sh set -e -cd $(dirname "$0") +ROOT=$(dirname "$0") +cd "${ROOT}" + . lib/abort_if_not_user.sh . lib/check_finished_marker.sh . lib/constants_repopaths.sh # PATH_CONF, PATH_SCRIPTS -- 2.30.2