From 1eb302258f0ef8d4bed06094082948b525984f0a Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 23 Mar 2025 18:46:17 +0100
Subject: [PATCH] Fix.
---
testing/home/desktop/.local/bin/borgplom | 2 +-
testing/scripts/setup_secrets.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index 24d84ea..8a9eead 100755
--- 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 76ec216..399e46a 100755
--- 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
--
2.30.2