From 0ee8ccf59dc5283ffc52e4857124b1c68755f1a0 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 5 Mar 2025 22:29:13 +0100
Subject: [PATCH] Fix.
---
testing/scripts/setup_secrets_user.sh | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/testing/scripts/setup_secrets_user.sh b/testing/scripts/setup_secrets_user.sh
index 007ee49..cf09477 100755
--- a/testing/scripts/setup_secrets_user.sh
+++ b/testing/scripts/setup_secrets_user.sh
@@ -2,6 +2,10 @@
set -e
. ./_misc.sh
+# to remind user to go online if not yet done
+# TODO: replace by actual test
+nmtui
+
BORG_PASSPHRASE="$1"
PATH_REPOS="${HOME}/repos"
PATH_BORGKEYS="${HOME}/.config/borg/keys"
@@ -39,11 +43,16 @@ ssh ${REPOS_SITE_LOGIN} "cd $REMOTE_PATH_REPOS && ls -1" | while read REPO_NAME;
done
echo "Set up borg and pull in ~/org"
-mkdir "${PATH_BORGKEYS}"
-tar xf "${PATH_SECRETS}/borg_keyfiles.tar" -C "${PATH_BORGKEYS}"
+PATH_TARED_KEYS=borg_keyfiles
+mkdir -p "${PATH_BORGKEYS}"
+tar xf "${PATH_SECRETS}/${PATH_TARED_KEYS}.tar"
+mv "${PATH_TARED_KEYS}"/* "${PATH_BORGKEYS}/"
+rmdir "${PATH_TARED_KEYS}"
ls -1 "${PATH_BORGKEYS}/" | while read FILENAME; do
SERVER_NAME=$(echo "${FILENAME}" | sed 's/.*@//')
+ set +e
ssh-keyscan "${SERVER_NAME}" >> "${PATH_KNOWN_HOSTS}"
+ set -e
done
while true; do
set +e
--
2.30.2