Restructure.

diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index 477ecf6f1de4a718ee8e307c2e8a3cb4eaf205b4..dec639f0861ae075c21eb24c8a761987dad4b472 100755 (executable)
--- a/testing/home/desktop/.local/bin/borgplom
+++ b/testing/home/desktop/.local/bin/borgplom
@@ -8,7 +8,7 @@ NAME_REPO=borg
 NAME_ARCHIVE=orgdir
 
 if [ "$1" = "orgpull" ]; then
-    PATH_PIPE="/tmp/pipe_$(date +'%s')"
+    PATH_PIPE="$(path_tmp_timestamped 'pipe')"
     mkfifo "${PATH_PIPE}"
     ls -1 "${PATH_BORGKEYS}/" > "${PATH_PIPE}" &
     while read FILENAME; do

diff --git a/testing/home/desktop/.plomlib.sh/path_tmp_timestamped b/testing/home/desktop/.plomlib.sh/path_tmp_timestamped
new file mode 100644 (file)
index 0000000..7ae63cd
--- /dev/null
+++ b/testing/home/desktop/.plomlib.sh/path_tmp_timestamped
@@ -0,0 +1,3 @@
+path_tmp_timestamped () {
+    printf "/tmp/${1}_$(date +'%s')"
+}

diff --git a/testing/scripts/_setup_secrets_user.sh b/testing/scripts/_setup_secrets_user.sh
index 9d935ebecda78d0b229c0dbbfb920f104592c1e4..60196c313ad68c9daf789d9b59408dafc0ffabb2 100644 (file)
--- a/testing/scripts/_setup_secrets_user.sh
+++ b/testing/scripts/_setup_secrets_user.sh
@@ -7,13 +7,11 @@ cd $(dirname "$0")
 # abort_if_exists
 # abort_if_not_user
 # abort_if_offline
-# - PATH_REPO
-# - PATH_USER_HOME
 # - USERNAME
 
 PATH_REPOS="${HOME}/repos"
 PATH_BORGKEYS="${HOME}/.config/borg/keys"
-PATH_USER_SSH="${PATH_USER_HOME}/.ssh"
+PATH_USER_SSH="${HOME}/.ssh"
 FILENAME_KEY=id_rsa
 PATH_PRIVATE_KEY="${PATH_USER_SSH}/${FILENAME_KEY}"
 PATH_KNOWN_HOSTS="${PATH_USER_SSH}/known_hosts"
@@ -89,8 +87,3 @@ while true; do
        exit 1
     fi
 done
-
-PATH_REL_REPO=$(basename "${PATH_REPO}")
-PATH_REL_DEL_REPO="DELETE_${PATH_REL_REPO}"
-mv "${HOME}/${PATH_REL_REPO}" "${HOME}/${PATH_REL_DEL_REPO}"
-echo "\nWith ~/repos set up, new reference be ~/repos/${PATH_REL_REPO}; moved ~/${PATH_REL_REPO} to ~/${PATH_REL_DEL_REPO}, ready to be deleted by you."

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index ac0a0f72ff351d551ffea392c29e5d97520bd4dd..0473b46be2025cac0e0e5e20a50a5243eb73e0cf 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -204,6 +204,5 @@ echo "\nSetting up user ${USERNAME}."
 adduser --disabled-password --gecos "" "${USERNAME}"
 usermod -a -G sudo "${USERNAME}"
 copy_dirtree "${PATH_CONF_HOME}" "${PATH_USER_HOME}" ${MIN_TAGS} ${TAGS_USER}
-cp -a "${PATH_REPO}" "${PATH_USER_HOME}/"
 chown -R "${USERNAME}:${USERNAME}" "${PATH_USER_HOME}"
 passwd "${USERNAME}"

diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh
index 224ac7e0cdf2a9b835edb925ee0feffe96583d6b..de5af3910221db36293116e5a552208f3e3614f6 100755 (executable)
--- a/testing/scripts/setup_secrets.sh
+++ b/testing/scripts/setup_secrets.sh
@@ -8,13 +8,11 @@ cd $(dirname "$0")
 # - abort_if_not_user
 # - abort_if_offline
 # - expect_min_n_args
-# - DEBIAN_RELEASE
-# - PATH_CONF_HOME
-# - PATH_REPO
 # - PATH_USER_HOME
 # - USERNAME
 
 . "${PATH_USER_HOME}/.plomlib.sh/get_passphrase"
+. "${PATH_USER_HOME}/.plomlib.sh/path_tmp_timestamped"
 
 PATH_REL_SECRETS=to_usb
 export PATH_SECRETS="${PATH_USER_HOME}/${PATH_REL_SECRETS}"
@@ -28,7 +26,7 @@ expect_min_n_args 1 "(device name, e.g. 'sda')" "$@"
 SECRETS_DEV=$1
 PATH_SOURCE=/media/${SECRETS_DEV}/${PATH_REL_SECRETS}
 PATH_DEV=/dev/${SECRETS_DEV}
-PATH_PMOUNT_ERR="/tmp/err_pmount_$(date +'%s')"
+PATH_PMOUNT_ERR="$(path_tmp_timestamped 'err_mount')"
 echo "Put secrets drive into slot for ${PATH_DEV}."
 while [ ! -e "${PATH_DEV}" ]; do
     sleep 0.1
@@ -56,4 +54,6 @@ echo "You can remove ${PATH_DEV} now."
 chown -R "${USERNAME}:${USERNAME}" "${PATH_SECRETS}"
 
 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"
+PATH_TMP_SCRIPTS="$(path_tmp_timestamped configscripts)"
+cp -a ./* "${PATH_TMP_SCRIPTS}/"
+su -l "${USERNAME}" --whitelist-environment=PATH_SECRETS,BORG_PASSPHRASE -c "/bin/sh "${PATH_TMP_SCRIPTS}/_setup_secrets_user.sh"