From 9915a1c72ba5f273ab54ca929410d5bf31ad97c7 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Wed, 19 Jun 2024 02:14:24 +0200
Subject: [PATCH] Fix file paths in installation functions

---
 profiles/DerGeret/Arch/install.sh | 32 ++++++++++++++++---------------
 profiles/Generic/Arch/install.sh  | 16 +++++++++-------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/profiles/DerGeret/Arch/install.sh b/profiles/DerGeret/Arch/install.sh
index cc60fb20..a6a1cb40 100755
--- a/profiles/DerGeret/Arch/install.sh
+++ b/profiles/DerGeret/Arch/install.sh
@@ -1,19 +1,21 @@
 #!/bin/bash -e
-pushd "${BASH_SOURCE%/*}" > /dev/null;
+function install() {
+    local dir="$(realpath "${BASH_SOURCE%/*}")";
 
-function installDrivers() {
-    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";
+    function installDrivers() {
+        . "$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";
+    }
+
+    function initializeConfig() {
+        . "$dir/../../../scripts/Unix/Devices/Logitech G903/install.sh";
+    }
+
+    pushd "$dir" > /dev/null;
+    . "../../../scripts/Arch/OS/install.sh";
+    popd > /dev/null;
 }
 
-function initializeConfig() {
-    local dir="${BASH_SOURCE%/*}";
-    . "$dir/../../../scripts/Unix/Devices/Logitech G903/install.sh";
-}
-
-. "../../../scripts/Arch/OS/install.sh";
-
-popd > /dev/null;
+install;
diff --git a/profiles/Generic/Arch/install.sh b/profiles/Generic/Arch/install.sh
index 287fb175..8248e6e6 100755
--- a/profiles/Generic/Arch/install.sh
+++ b/profiles/Generic/Arch/install.sh
@@ -1,11 +1,13 @@
 #!/bin/bash -e
-pushd "${BASH_SOURCE%/*}" > /dev/null;
+function install() {
+    local dir="$(realpath "${BASH_SOURCE%/*}")";
 
-function installDrivers() {
-    local dir="${BASH_SOURCE%/*}";
-    . "$dir/../../../scripts/Arch/Config/SecureBoot/install.sh";
+    function installDrivers() {
+        . "$dir/../../../scripts/Arch/Config/SecureBoot/install.sh";
+    }
+
+
+    . "../../../scripts/Arch/OS/install.sh";
 }
 
-. "../../../scripts/Arch/OS/install.sh";
-
-popd > /dev/null;
+install;