Fix.

diff --git a/testing/scripts/setup_secrets_user.sh b/testing/scripts/setup_secrets_user.sh
index 007ee49d30f4039a00be6d7228316f18291e8737..cf0947722b743ba8d55b0a62f4dd9c8a6286495c 100755 (executable)
--- a/testing/scripts/setup_secrets_user.sh
+++ b/testing/scripts/setup_secrets_user.sh
@@ -2,6 +2,10 @@
 set -e
 . ./_misc.sh
 
 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"
 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"
 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/.*@//')
 ls -1 "${PATH_BORGKEYS}/" | while read FILENAME; do
     SERVER_NAME=$(echo "${FILENAME}" | sed 's/.*@//')

+    set +e

     ssh-keyscan "${SERVER_NAME}" >> "${PATH_KNOWN_HOSTS}"
     ssh-keyscan "${SERVER_NAME}" >> "${PATH_KNOWN_HOSTS}"

+    set -e

 done
 while true; do
     set +e
 done
 while true; do
     set +e