From fbd31fa83708cc80121296e690d05ad8a5bb0251 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Wed, 27 Mar 2024 09:29:54 +0100
Subject: [PATCH] Prevent working directory confusion

---
 profiles/DerGeret/Arch/install.sh    |  9 +++++----
 profiles/ManuSurface/Arch/install.sh | 11 +++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/profiles/DerGeret/Arch/install.sh b/profiles/DerGeret/Arch/install.sh
index 29ca0a37..89fbcd96 100755
--- a/profiles/DerGeret/Arch/install.sh
+++ b/profiles/DerGeret/Arch/install.sh
@@ -2,10 +2,11 @@
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 function installDrivers() {
-    . "../../../scripts/Arch/Config/SecureBoot/install.sh";
-    . "../../../scripts/Arch/Software/nvidia-dkms/install.sh";
-    . "../../../scripts/Arch/Software/xone/install.sh";
-    . "../../../scripts/Arch/Software/bt-dualboot/install.sh";
+    local dir="${BASH_SOURCE%/*}";
+    . "$dir/../../../scripts/Arch/Config/SecureBoot/install.sh";
+    . "$dir/../../../scripts/Arch/Software/nvidia-dkms/install.sh";
+    . "$dir/../../../scripts/Arch/Software/xone/install.sh";
+    . "$dir/../../../scripts/Arch/Software/bt-dualboot/install.sh";
 }
 
 . "../../../scripts/Arch/OS/install.sh";
diff --git a/profiles/ManuSurface/Arch/install.sh b/profiles/ManuSurface/Arch/install.sh
index 46e1b0d5..48f434a0 100755
--- a/profiles/ManuSurface/Arch/install.sh
+++ b/profiles/ManuSurface/Arch/install.sh
@@ -2,16 +2,19 @@
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 function installDrivers() {
-    . "../../../scripts/Arch/Config/SecureBoot/install.sh";
-    . "../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
+    local dir="${BASH_SOURCE%/*}";
+    . "$dir/../../../scripts/Arch/Config/SecureBoot/install.sh";
+    . "$dir/../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
 }
 
 function installSoftware() {
-    . "../../../scripts/Arch/Collections/school.sh";
+    local dir="${BASH_SOURCE%/*}";
+    . "$dir/../../../scripts/Arch/Collections/school.sh";
 }
 
 function initializeConfig() {
-    . "../../../scripts/Common/Config/Steam/hidpi.sh";
+    local dir="${BASH_SOURCE%/*}";
+    . "$dir/../../../scripts/Common/Config/Steam/hidpi.sh";
 }
 
 . "../../../scripts/Arch/OS/install.sh";