Fix.

diff --git a/trixie/copy/desktop/home/plom/.local/bin/setup_secrets b/trixie/copy/desktop/home/plom/.local/bin/setup_secrets
index d0fb34c3ea27019f893ca29f0c718fe7cb8f6433..71c20e35a8fda20e4e1b9bff3406d5d22cbba4cf 100755 (executable)
--- 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 f40f720039c6926b42dfbd77d5b31eb8685c11b1..08ae489c394875db5ef43ab797d732d99c877a99 100755 (executable)
--- 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