Minor fixes.

diff --git a/testing/scripts/misc.sh b/testing/scripts/misc.sh
index cbf0c5c8e14a215602f14197ec414d955edb4430..7520e9d3416ac6782b76ee9e9921896cdeb8677e 100644 (file)
--- a/testing/scripts/misc.sh
+++ b/testing/scripts/misc.sh
@@ -4,12 +4,8 @@ set -e
 . ../../constants.sh
 . "${PATH_MANY_MISC}"
 
-repo_path="${HOME}/public_repos/${PATH_REL_REPO}"
-if [ ! -d "${repo_path}" ]; then
-    repo_path="${HOME}/${PATH_REL_REPO}"
-fi
-config_tree_prefix="${repo_path}/testing"
-setup_scripts_dir="${config_tree_prefix}/scripts"
+PATH_REL_SECRETS=to_usb
+PATH_SECRETS=${PATH_USER_HOME}/${PATH_REL_SECRETS}
 
 get_system_name_arg() {
     thinkpad_names="x220 w530 t490s"

diff --git a/testing/scripts/setup_secrets_root.sh b/testing/scripts/setup_secrets_root.sh
index 1171043c319bb12b72ba18f782fa016087a938ef..a0dd144a899348061d3c48c9f6bff0795a91577c 100755 (executable)
--- a/testing/scripts/setup_secrets_root.sh
+++ b/testing/scripts/setup_secrets_root.sh
@@ -5,8 +5,6 @@ set -e
 abort_if_not_user root
 
 # Mount secrets device and copy over its content.
-PATH_REL_SECRETS=to_usb
-PATH_SECRETS=${PATH_USER_HOME}/${PATH_REL_SECRETS}
 abort_if_exists "${PATH_SECRETS}"
 expect_min_n_args 1 "(device name)" "$@"
 SECRETS_DEV=$1

diff --git a/testing/scripts/setup_secrets_user.sh b/testing/scripts/setup_secrets_user.sh
index 76e7e835809912e0588ea52e69618072b0ad8e8d..c5552df2f5472c9cae379a6dda45220923c6e092 100755 (executable)
--- a/testing/scripts/setup_secrets_user.sh
+++ b/testing/scripts/setup_secrets_user.sh
@@ -2,7 +2,7 @@
 set -e
 . ./misc.sh
 
-abort_if_not_user "${USERNAME}" 
+abort_if_not_user "${USERNAME}"
 abort_if_exists "${PATH_USER_SSH}"
 PATH_REPOS="${HOME}/repos"
 abort_if_exists "${PATH_REPOS}"