Enhance resolving of source files

scripts/Software/Collections/personal.sh

@@ -1,34 +1,34 @@
 #!/bin/bash
-dir="${BASH_SOURCE%/*}";
+pushd "${BASH_SOURCE%/*}";
 scriptRoot="$dir/../..";
 utilRoot="$scriptRoot/Scripts";
 deviceRoot="$scriptRoot/Devices";
 softwareRoot="$scriptRoot/Software";
 configRoot="$scriptRoot/Config";
 
-source "$softwareRoot/rclone/install.sh";
+source "../../Software/rclone/install.sh";
 
 # Install Brave
-source "$softwareRoot/Brave/install-stable.sh";
-source "$softwareRoot/Brave/install-beta.sh";
-source "$softwareRoot/Brave/install-nightly.sh";
-source "$softwareRoot/Brave/install-extensions.sh";
-source "$softwareRoot/Google Chrome/install.sh";
+source "../../Software/Brave/install-stable.sh";
+source "../../Software/Brave/install-beta.sh";
+source "../../Software/Brave/install-nightly.sh";
+source "../../Software/Brave/install-extensions.sh";
+source "../../Software/Google Chrome/install.sh";
 
 # Install further software
-source "$softwareRoot/git/install.sh";
-source "$softwareRoot/logo-ls/install.sh";
-source "$softwareRoot/VSCodium/install.sh";
-source "$softwareRoot/Visual Studio Code/install.sh";
-source "$softwareRoot/Node.js/install.sh";
-source "$softwareRoot/Python/install.sh";
-source "$softwareRoot/tea/install.sh";
-source "$softwareRoot/Godot/install.sh";
-source "$softwareRoot/Virtual Machine Manager/install.sh";
-source "$softwareRoot/Woodpecker CLI/install.sh";
+source "../../Software/git/install.sh";
+source "../../Software/logo-ls/install.sh";
+source "../../Software/VSCodium/install.sh";
+source "../../Software/Visual Studio Code/install.sh";
+source "../../Software/Node.js/install.sh";
+source "../../Software/Python/install.sh";
+source "../../Software/tea/install.sh";
+source "../../Software/Godot/install.sh";
+source "../../Software/Virtual Machine Manager/install.sh";
+source "../../Software/Woodpecker CLI/install.sh";
 
 # Install General Packages from APT
-source "$softwareRoot/common-apt/install.sh";
+source "../../Software/common-apt/install.sh";
 
 # Install other flatpaks
 flatpak install -y flathub com.bitwarden.desktop;
@@ -39,3 +39,4 @@ flatpak install -y flathub com.github.wwmm.easyeffects;
 flatpak install -y flathub ch.threema.threema-web-desktop;
 flatpak install -y flathub app.ytmdesktop.ytmdesktop;
 flatpak install -y flathub com.github.tchx84.Flatseal;
+popd;

scripts/Software/Collections/school.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
-dir="${BASH_SOURCE%/*}";
-softwareRoot="$dir/..";
-source "$dir/personal.sh";
+pushd "${BASH_SOURCE%/*}";
+source "./personal.sh";
 
-source "$softwareRoot/Java/install.sh";
-source "$softwareRoot/cloudflared/install.sh";
+source "../Java/install.sh";
+source "../cloudflared/install.sh";
 
 # Install other flatpaks
 flatpak install -y flathub com.github.xournalpp.xournalpp;
 flatpak install -y flathub com.github.flxzt.rnote;
+popd;

scripts/Software/Java/install.sh

@@ -4,7 +4,7 @@ if [ ! "$UID" -eq 0 ]
 then
     sudo bash "$BASH_SOURCE";
     curl -s "https://get.sdkman.io" | bash;
-    source "$HOME/.sdkman/bin/sdkman-init.sh";
+    source "~/.sdkman/bin/sdkman-init.sh";
     sdk install gradle 7.5.1;
 else
     apt install -y wget apt-transport-https;

scripts/Software/Node.js/install.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 export NVS_HOME="$HOME/.nvs";
 git clone https://github.com/jasongin/nvs "$NVS_HOME";
+# shellcheck source=~/.nvs/nvs.sh
 . "$NVS_HOME/nvs.sh" install;
 bash -c 'exec bash -c "nvs add latest"';
 bash -c 'exec bash -c "nvs link latest"';

scripts/Software/Python/install.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
-dir="${BASH_SOURCE%/*}";
-source "$dir/setup.sh";
-source "$dir/pyenv.sh";
+pushd "${BASH_SOURCE%/*}";
+source "./setup.sh";
+source "./pyenv.sh";
+popd;