From 55af51463cd06d5011658989d7a85112dbbf3789 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 23 Mar 2025 17:10:06 +0100
Subject: [PATCH] Various fixes.
---
testing/home/desktop/.local/bin/borgplom | 1 +
testing/home/desktop/.nonpath_bins/plomlib.sh.desktop | 1 -
testing/scripts/_setup_secrets_user.sh | 2 +-
testing/scripts/setup_secrets.sh | 1 +
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index 53afe44..559def8 100755
--- 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 cbcb013..e50a77b 100644
--- 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 5b2b512..ba8720a 100644
--- 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 55cb64a..aaf2011 100755
--- 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}"
--
2.30.2