From 71f98bde15a384c1e29c0d528b65c307faf7daae Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 7 Apr 2025 22:02:42 +0200
Subject: [PATCH] Fix.
---
testing/home/desktop/.local/bin/borgplom | 4 ++--
testing/scripts/lib/mount_secrets | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index 7e25658..75b3f82 100755
--- a/testing/home/desktop/.local/bin/borgplom
+++ b/testing/home/desktop/.local/bin/borgplom
@@ -30,7 +30,7 @@ USAGE_INDICES='backup_keys claim help info init keys orgpull orgpush'
_run_borg_with_passphrase() {
_FIRST_RUN=1
- _PREPARE='
+ _ON_LOOP_START='
if [ -z "${BORG_PASSPHRASE}" ]; then
printf "Passphrase:"
export BORG_PASSPHRASE="$(get_passphrase)"
@@ -40,7 +40,7 @@ _run_borg_with_passphrase() {
_TO_TEST='borg '"$@"
_ON_FAIL='echo "unexpected borg error, code ${_RESULT}."'
_ON_LOOP_END='export BORG_PASSPHRASE='
- retry_until 52 "${_PREPARE}" "${_TO_TEST}" "${_ON_FAIL}" "${_ON_LOOP_END}"
+ retry_until 52 "${_ON_LOOP_START}" "${_TO_TEST}" "${_ON_FAIL}" "${_ON_LOOP_END}"
}
_id_from_file() { head -1 "$1" | cut -d' ' -f2; }
diff --git a/testing/scripts/lib/mount_secrets b/testing/scripts/lib/mount_secrets
index d262c52..b49c559 100644
--- a/testing/scripts/lib/mount_secrets
+++ b/testing/scripts/lib/mount_secrets
@@ -17,10 +17,10 @@ mount_secrets() {
while [ ! -e "${PATH_DEV}" ]; do
sleep 0.1
done
- _PREPARE='printf "Passphrase: "; PASSPHRASE=$(get_passphrase); echo ""'
+ _ON_LOOP_START='printf "Passphrase: "; PASSPHRASE=$(get_passphrase); echo ""'
_TO_TEST='echo "${PASSPHRASE}" | pmount "${PATH_DEV}" 2>&1'
_ON_FAIL='echo "Aborting due to pmount error:'
- retry_until 100 "${_PREPARE}" "${_TO_TEST}" "${_ON_FAIL}"
+ retry_until 100 "${_ON_LOOP_START}" "${_TO_TEST}" "${_ON_FAIL}"
echo "${_OUTPUT}"
}
--
2.30.2