From 5946fc561cfc2df461bad953944d8ff7b7529547 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 4 Mar 2025 00:25:22 +0100
Subject: [PATCH] Minor fixes.
---
testing/scripts/misc.sh | 8 ++------
testing/scripts/setup_secrets_root.sh | 2 --
testing/scripts/setup_secrets_user.sh | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/testing/scripts/misc.sh b/testing/scripts/misc.sh
index cbf0c5c..7520e9d 100644
--- 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 1171043..a0dd144 100755
--- 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 76e7e83..c5552df 100755
--- 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}"
--
2.30.2