Fix.

diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index 24d84eafa765e5425c9813216ed9c1e4e86b9a2f..8a9eead05954a9fed6697a3282d6787f28f11047 100755 (executable)
--- a/testing/home/desktop/.local/bin/borgplom
+++ b/testing/home/desktop/.local/bin/borgplom
@@ -26,12 +26,12 @@ if [ "$1" = "orgpull" ]; then
         if [ -z "${BORG_PASSPHRASE}" ]; then
             printf 'Passhrapse:'    
             export BORG_PASSPHRASE="$(get_passphrase)"
+            echo ''
         fi
         set +e
         ARCHIVES=$(borg list "${REPO}")  # separate step so we may fail early on bad passphrase
         RESULT=$?
         set -e
-        echo ''
         if [ "${RESULT}" = "0" ]; then
             break
         elif [ "${RESULT}" != "2" ]; then

diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh
index 76ec216ff7ec6bf67eff85d2f213343613cfaba8..399e46ad6cb1faede7bc06849de8badc7f759f71 100755 (executable)
--- a/testing/scripts/setup_secrets.sh
+++ b/testing/scripts/setup_secrets.sh
@@ -17,7 +17,7 @@ cd $(dirname "$0")
 . "${PATH_USER_HOME}/.nonpath_bins/plomlib.sh.desktop"
 # for: get_passphrase
 
-PATH_REL_SECRETS=usb
+PATH_REL_SECRETS=to_usb
 export PATH_SECRETS="${PATH_USER_HOME}/${PATH_REL_SECRETS}"
 
 abort_if_not_user root
@@ -36,11 +36,11 @@ done
 while true; do
     printf 'Passphrase: '
     PASSPHRASE=$(get_passphrase)
+    echo ''
     set +e
     echo "${PASSPHRASE}" | pmount "${PATH_DEV}"
     RESULT=$?
     set -e
-    echo ''
     if [ "${RESULT}" = "0" ]; then
         break
     elif [ "${RESULT}" != "100" ]; then