Fixes.

diff --git a/bookworm/scripts/lib/constants_repopaths b/bookworm/scripts/lib/constants_repopaths
new file mode 100644 (file)
index 0000000..7746987
--- /dev/null
+++ b/bookworm/scripts/lib/constants_repopaths
@@ -0,0 +1,3 @@
+PATH_SCRIPTS="$(dirname $(pwd))"
+PATH_CONF="$(dirname ${SCRIPTS_DIR})"
+

diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index e47712ed951f21c4d6ae5fc5b6164946666d5a55..b04de66083c5b66d62c34a8c99ae71d0526464e9 100755 (executable)
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -1,12 +1,13 @@
 #!/bin/sh
 set -e
 cd $(dirname "$0")
+. lib/constants_repopaths # PATH_CONF
 . lib/constants_server  # PATH_REL_SSH, PATH_SSH
 . lib/copy_dirtree
 . lib/determine_ip
 . lib/expect_min_n_args
 . lib/init_packages
-. libs/setup_users
+. lib/setup_users
 
 MIN_TAGS='all server'
 
@@ -16,11 +17,7 @@ FQDN="$2"
 
 USERNAME=plom
 PATH_USER_HOME="/home/${USERNAME}"
-PARENT_DIR="$(dirname $(pwd))"
-DEBIAN_RELEASE="$(basename ${PARENT_DIR})"
-PATH_REPO="$(dirname ${PARENT_DIR})"
 PATH_REL_ETC=etc
-PATH_CONF="${PATH_REPO}/${DEBIAN_RELEASE}"
 PATH_CONF_ETC="${PATH_CONF}/${PATH_REL_ETC}"
 PATH_USER_SSH="${PATH_USER_HOME}/${PATH_REL_SSH}"
 PATH_ETC="/${PATH_REL_ETC}"

diff --git a/testing/scripts/lib/constants_repopaths b/testing/scripts/lib/constants_repopaths
new file mode 120000 (symlink)
index 0000000..d796f1c
--- /dev/null
+++ b/testing/scripts/lib/constants_repopaths
@@ -0,0 +1 @@
+../../../bookworm/scripts/lib/constants_repopaths
\ No newline at end of file

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index 5932559a06c1a1646443e62ca53ec314462afd35..b428c42438ccd01a504fcee9f6b9e65aea2fe4a2 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -4,17 +4,13 @@ cd $(dirname "$0")
 . lib/abort
 . lib/abort_if_offline
 . lib/constants  # PATH_USER_HOME, USERNAME
+. lib/constants_repopaths  # PATH_CONF
 . lib/copy_dirtree
 . lib/determine_ip
 . lib/expect_min_n_args
 . lib/init_packages
 . lib/setup_users
 
-PARENT_DIR=$(dirname $(pwd))
-DEBIAN_RELEASE=$(basename ${PARENT_DIR})
-PATH_REPO=$(dirname ${PARENT_DIR})
-PATH_CONF="${PATH_REPO}/${DEBIAN_RELEASE}"
-
 PATH_REL_ETC=etc
 PATH_CONF_ETC="${PATH_CONF}/${PATH_REL_ETC}"
 PATH_ETC="/${PATH_REL_ETC}"
@@ -83,7 +79,7 @@ MIN_TAGS="${TAG_ALL} ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME} desktop"
 
 export DEBIAN_FRONTEND=noninteractive
 
-echo "\nUpgrading to ${DEBIAN_RELEASE}."
+echo "\nUpgrading to testing."
 # For this step only very selectively prepare /etc/ files.
 cp "${PATH_CONF_ETC}/${TAG_ALL}/${PATH_REL_APT_CONF}/99_minimize_dependencies" "${PATH_ETC}/${PATH_REL_APT_CONF}/"
 upgrade_from_older_release

diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh
index ea9b351c959f82233caa599f06f573a4287dccff..f2294f15df8e6ef6f4a98bbca6c9c35886732902 100755 (executable)
--- a/testing/scripts/setup_secrets.sh
+++ b/testing/scripts/setup_secrets.sh
@@ -6,10 +6,13 @@ cd $(dirname "$0")
 . lib/abort_if_not_user
 . lib/abort_if_offline
 . lib/constants  # PATH_USER_HOME, USERNAME
+. lib/constants_repopaths
 . lib/expect_min_n_args
 . lib/get_passphrase
 . lib/path_tmp_timestamped
 
+PATH_REL_SETUP_SECRETS_USER="$(basename ${PATH_CONF})/$(basename ${PATH_SCRIPTS})/_setup_secrets_user.sh"
+PATH_REPO="$(dirname ${PATH_CONF})"
 PATH_REL_SECRETS=.secrets
 export PATH_SECRETS="${PATH_USER_HOME}/${PATH_REL_SECRETS}"
 
@@ -46,9 +49,8 @@ echo "You can remove ${PATH_DEV} now."
 chown -R "${USERNAME}:${USERNAME}" "${PATH_SECRETS}"
 
 export BORG_PASSPHRASE="${PASSPHRASE}"
-PATH_TMP_SCRIPTS="$(path_tmp_timestamped configscripts)"
-mkdir "${PATH_TMP_SCRIPTS}"
-cp -aL ./* "${PATH_TMP_SCRIPTS}/"
-chown -R "${USERNAME}:${USERNAME}" "${PATH_TMP_SCRIPTS}"
-su -l "${USERNAME}" --whitelist-environment=PATH_SECRETS,BORG_PASSPHRASE -c "/bin/sh ${PATH_TMP_SCRIPTS}/_setup_secrets_user.sh"
-rm -rf "${PATH_TMP_SCRIPTS}"
+PATH_TMP_REPO="$(path_tmp_timestamped configrepo)"
+cp -aL "${PATH_REPO}" "${PATH_TMP_REPO}" 
+chown -R "${USERNAME}:${USERNAME}" "${PATH_TMP_REPO}"
+su -l "${USERNAME}" --whitelist-environment=PATH_SECRETS,BORG_PASSPHRASE -c "/bin/sh ${PATH_TMP_REPO}/${PATH_REL_SETUP_SECRETS_USER}"
+rm -rf "${PATH_TMP_REPO}"