Various fixes.

diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index 53afe44735b24d6b6b144ff9a33cb2c5797d6bb6..559def8382b0fdddb06eee75ef5723725de47e35 100755 (executable)
--- a/testing/home/desktop/.local/bin/borgplom
+++ b/testing/home/desktop/.local/bin/borgplom
@@ -24,6 +24,7 @@ if [ "$1" = "orgpull" ]; then
     REPO="${NAME_SERVER}:${NAME_REPO}"
     while true; do
         if [ -z "${BORG_PASSPHRASE}" ]; then
+            printf 'Passhrapse:'    
             export BORG_PASSPHRASE="$(get_passphrase)"
         fi
         set +e

diff --git a/testing/home/desktop/.nonpath_bins/plomlib.sh.desktop b/testing/home/desktop/.nonpath_bins/plomlib.sh.desktop
index cbcb013964633ea3555c54be0fe79b7013d67e6a..e50a77b53304ca8d0b3db94841324517ac0d8e68 100644 (file)
--- a/testing/home/desktop/.nonpath_bins/plomlib.sh.desktop
+++ b/testing/home/desktop/.nonpath_bins/plomlib.sh.desktop
@@ -1,6 +1,5 @@
 get_passphrase() {
     stty -echo
-    printf "\nPassphrase: "
     read PASSPHRASE
     stty echo
     printf "${PASSPHRASE}"

diff --git a/testing/scripts/_setup_secrets_user.sh b/testing/scripts/_setup_secrets_user.sh
index 5b2b5121a85775a9ae05dbfbcf192ccc7ae5990b..ba8720aeba029c9fb858183fe13f10f7afa68ee6 100644 (file)
--- a/testing/scripts/_setup_secrets_user.sh
+++ b/testing/scripts/_setup_secrets_user.sh
@@ -32,7 +32,7 @@ abort_if_exists "${PATH_BORGKEYS}"
 echo "\nSetting up ~/.ssh"
 PATH_PUBLIC_KEY="${PATH_PRIVATE_KEY}.pub"
 mkdir -p "${PATH_USER_SSH}"
-cp "${PATH_SECRETS}/${FILENAME_KEY}" "${PATH_KEY}"
+cp "${PATH_SECRETS}/${FILENAME_KEY}" "${PATH_PRIVATE_KEY}"
 stty -echo
 while [ ! -s "${PATH_PUBLIC_KEY}" ]; do
     set +e

diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh
index 55cb64af4de2867447127872bf7d577b7327e395..aaf201127b44caebc571b71e0017b20c43a23460 100755 (executable)
--- a/testing/scripts/setup_secrets.sh
+++ b/testing/scripts/setup_secrets.sh
@@ -33,6 +33,7 @@ while [ ! -e "${PATH_DEV}" ]; do
     sleep 0.1
 done
 while true; do
+    printf 'Passphrase: '
     PASSPHRASE=$(get_passphrase)
     set +e
     echo "${PASSPHRASE}" | pmount "${PATH_DEV}"