Further fixes.

diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index 559def8382b0fdddb06eee75ef5723725de47e35..24d84eafa765e5425c9813216ed9c1e4e86b9a2f 100755 (executable)
--- a/testing/home/desktop/.local/bin/borgplom
+++ b/testing/home/desktop/.local/bin/borgplom
@@ -31,6 +31,7 @@ if [ "$1" = "orgpull" ]; then
         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_user.sh b/testing/scripts/_setup_secrets_user.sh
index ba8720aeba029c9fb858183fe13f10f7afa68ee6..3c110e86fb4ef7c4adbf1fba86f9172717ce0e6a 100644 (file)
--- a/testing/scripts/_setup_secrets_user.sh
+++ b/testing/scripts/_setup_secrets_user.sh
@@ -19,9 +19,6 @@ PATH_KNOWN_HOSTS="${PATH_USER_SSH}/known_hosts"
 REPOS_SITE_DOMAIN=plomlompom.com
 REMOTE_PATH_REPOS=/var/repos
 NAME_BORGAPP=borgplom
-if [ ! -z "$1" ]; then
-    export BORG_PASSPHRASE="$1"
-fi
 
 abort_if_not_user "${USERNAME}"
 abort_if_offline

diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh
index aaf201127b44caebc571b71e0017b20c43a23460..b90303aeb6bc33af92732687a3cb5af39fecce9e 100755 (executable)
--- a/testing/scripts/setup_secrets.sh
+++ b/testing/scripts/setup_secrets.sh
@@ -14,7 +14,7 @@ cd $(dirname "$0")
 # - PATH_USER_HOME
 # - USERNAME
 
-. "${PATH_USER_HOME}/.nonpath_bins/plomlib.sh"
+. "${PATH_USER_HOME}/.nonpath_bins/plomlib.sh.desktop"
 # for: get_passphrase
 
 export PATH_SECRETS=${PATH_USER_HOME}/to_usb
@@ -39,6 +39,7 @@ while true; do
     echo "${PASSPHRASE}" | pmount "${PATH_DEV}"
     RESULT=$?
     set -e
+    echo ''
     if [ "${RESULT}" = "0" ]; then
         break
     elif [ "${RESULT}" != "100" ]; then
@@ -51,9 +52,5 @@ pumount "${SECRETS_DEV}"
 echo "You can remove ${PATH_DEV} now."
 chown -R "${USERNAME}:${USERNAME}" "${PATH_SECRETS}"
 
-CONTAINS_TICK=$(echo "${PASSPHRASE}" | grep "'" | wc -l)
-if [ "${CONTAINS_TICK}" = "1" ]; then
-  echo "Cannot pass to user script passphrase with illegal character, aborting."
-  exit 1
-fi
-su -l "${USERNAME}" -c "/bin/sh ./$(basename ${PATH_REPO})/${DEBIAN_RELEASE}/scripts/_setup_secrets_user.sh '${PASSPHRASE}'"
+export BORG_PASSPHRASE="${PASSPHRASE}"
+su -l "${USERNAME}" --whitelist-environment=PATH_SECRETS,BORG_PASSPHRASE -c "/bin/sh ./$(basename ${PATH_REPO})/${DEBIAN_RELEASE}/scripts/_setup_secrets_user.sh"