From da612ab38179fbe4fb189dd4df3c548445061d87 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 23 Oct 2024 06:20:26 +0200
Subject: [PATCH] More fixes.

---
 many_releases/scripts/_misc.sh | 2 ++
 testing/scripts/setup_raspi.sh | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/many_releases/scripts/_misc.sh b/many_releases/scripts/_misc.sh
index c25a291..d1aa606 100755
--- a/many_releases/scripts/_misc.sh
+++ b/many_releases/scripts/_misc.sh
@@ -27,6 +27,7 @@ copy_dirtree() {
     target_root="$2"
     shift 2
     modules="$@"
+    initial_directory="$(pwd)"
     for module in "${modules}"; do
         mkdir -p "${source_root}/${module}"
         cd "${source_root}/${module}"
@@ -38,6 +39,7 @@ copy_dirtree() {
             cp "${source_path}" "${target_path}"
         done
     done
+    cd "${initial_directory}"
 }
 
 install_for_modules() {
diff --git a/testing/scripts/setup_raspi.sh b/testing/scripts/setup_raspi.sh
index d3304cf..84c3f8a 100755
--- a/testing/scripts/setup_raspi.sh
+++ b/testing/scripts/setup_raspi.sh
@@ -14,12 +14,12 @@ rm "${FILENAME_PUBLIC_KEY}"
 # service sshd restart
 
 # properly apt system
-for root in "${PATH_MANY}" '../'; do
+for root in "${PATH_MANY}" '..'; do
     copy_dirtree "${root}/${NAME_ETC_DIR}" "" all
 done
 apt update
 mark_nonrequireds_auto
-for root in "${PATH_MANY}" '../'; do
+for root in "${PATH_MANY}" '..'; do
     install_for_modules "${root}/${NAME_APTMARK_DIR}" all
 done
 apt -y --purge autoremove
@@ -33,7 +33,7 @@ apt -y -o Dpkg::Options::='--force-confnew' full-upgrade
 # ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 
 # Set up users and their environments.
-for root in "${PATH_MANY}" '../'; do
+for root in "${PATH_MANY}" '..'; do
     copy_dirtree "${root}/${NAME_HOME_DIR}" '/root' minimal root
 done
 adduser --disabled-password --gecos "" plom
-- 
2.30.2