From a4946979b31484b1a84a756e68f148cd90840b22 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 28 Feb 2022 20:36:21 +0100
Subject: [PATCH] Make sure $SCRIPTDIR always has a nice looking path to the
 main scripts path

---
 lib/get_GPU.sh           | 3 +--
 lib/get_GPU_GROUP.sh     | 3 +--
 lib/get_GPU_ROM.sh       | 3 +--
 lib/get_USB_CTL.sh       | 3 +--
 lib/get_USB_CTL_GROUP.sh | 3 +--
 lib/set_MODULES.sh       | 4 ++--
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/get_GPU.sh b/lib/get_GPU.sh
index b97b0b1..0660ee7 100755
--- a/lib/get_GPU.sh
+++ b/lib/get_GPU.sh
@@ -33,8 +33,7 @@ DO NOT use any of the files from $SCRIPTDIR/config !
 }
 
 function main () {
-    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//")
-    SCRIPTDIR="$SCRIPTDIR/.."
+    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//" | perl -pe "s/\/lib$//")
     
     get_GPU
 }
diff --git a/lib/get_GPU_GROUP.sh b/lib/get_GPU_GROUP.sh
index dc051b1..2899ed2 100755
--- a/lib/get_GPU_GROUP.sh
+++ b/lib/get_GPU_GROUP.sh
@@ -56,8 +56,7 @@ USB_CTL_ID=()
 }
 
 function main () {
-    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//")
-    SCRIPTDIR="$SCRIPTDIR/.."
+    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//" | perl -pe "s/\/lib$//")
     
     get_GROUP $1
 }
diff --git a/lib/get_GPU_ROM.sh b/lib/get_GPU_ROM.sh
index 7a13198..62695bc 100755
--- a/lib/get_GPU_ROM.sh
+++ b/lib/get_GPU_ROM.sh
@@ -59,8 +59,7 @@ echo 0 | sudo tee $VBIOS_PATH
 
 
 function main () {
-    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//")
-    SCRIPTDIR="$SCRIPTDIR/.."
+    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//" | perl -pe "s/\/lib$//")
     
     get_GPU_ROM $1
 }
diff --git a/lib/get_USB_CTL.sh b/lib/get_USB_CTL.sh
index 44498ce..a0f3517 100755
--- a/lib/get_USB_CTL.sh
+++ b/lib/get_USB_CTL.sh
@@ -31,8 +31,7 @@ Press q to quit
 }
 
 function main () {
-    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//")
-    SCRIPTDIR="$SCRIPTDIR/.."
+    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//" | perl -pe "s/\/lib$//")
 
     get_USB_CTL
 }
diff --git a/lib/get_USB_CTL_GROUP.sh b/lib/get_USB_CTL_GROUP.sh
index b6999e3..ba3aece 100755
--- a/lib/get_USB_CTL_GROUP.sh
+++ b/lib/get_USB_CTL_GROUP.sh
@@ -38,8 +38,7 @@ To return to the previous page just press ENTER.
 }
 
 function main () {
-    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//")
-    SCRIPTDIR="$SCRIPTDIR/.."
+    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//" | perl -pe "s/\/lib$//")
     
     get_USB_CTL_GROUP $1
 }
diff --git a/lib/set_MODULES.sh b/lib/set_MODULES.sh
index 6448b5a..c181474 100755
--- a/lib/set_MODULES.sh
+++ b/lib/set_MODULES.sh
@@ -54,8 +54,8 @@ softdep radeon pre: vfio vfio_pci
 
 
 function main () {
-    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//")
-    SCRIPTDIR="$SCRIPTDIR/.."
+    SCRIPTDIR=$(dirname `which $0` | perl -pe "s/\/\.\.\/lib//" | perl -pe "s/\/lib$//")
+    
     set_MODULES $1
 }