From f4ed15669c96c23cbdfcd89aa6de60c6014ef490 Mon Sep 17 00:00:00 2001
From: cspark <work@cspark.dev>
Date: Mon, 18 Mar 2024 11:07:36 +0000
Subject: [PATCH] Smarter way to get absolute location

---
 home_resources/.local/bin/spark_ansible-editvault.sh | 8 +-------
 home_resources/.local/bin/spark_ansible-playbook.sh  | 8 +-------
 home_resources/.local/bin/spark_ansible-viewvault.sh | 8 +-------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/home_resources/.local/bin/spark_ansible-editvault.sh b/home_resources/.local/bin/spark_ansible-editvault.sh
index 3415ee3..62eb6df 100755
--- a/home_resources/.local/bin/spark_ansible-editvault.sh
+++ b/home_resources/.local/bin/spark_ansible-editvault.sh
@@ -11,13 +11,7 @@ USBKEYVAR=/dev/disk/by-uuid/{{ usbkey_uuid }}
 USBKEYSLOCATION={{ usbkey_keysdir }}
 
 # Figure out if path given is relative or absolute, assign variables accordingly
-if [[ "$(echo $1 | cut -c 1)" == "/" ]]; then 
-	# Absolute
-	ABSOLUTELOCATION=$1
-else
-	# Relative
-	ABSOLUTELOCATION="$(pwd)/$1"
-fi
+ABSOLUTELOCATION=$(realpath $1)
 # Probably cleaner to do this in awk or the like but good enough!
 # FILEPARENTDIR="$(echo $ABSOLUTELOCATION | cut -d / --fields=$(echo $ABSOLUTELOCATION | grep -o / | wc -l))"
 FILENAME="$(echo $ABSOLUTELOCATION | cut -d / --fields=$(($(echo $ABSOLUTELOCATION | grep -o / | wc -l) + 1))-)"
diff --git a/home_resources/.local/bin/spark_ansible-playbook.sh b/home_resources/.local/bin/spark_ansible-playbook.sh
index 6fad417..5d2afc6 100755
--- a/home_resources/.local/bin/spark_ansible-playbook.sh
+++ b/home_resources/.local/bin/spark_ansible-playbook.sh
@@ -11,13 +11,7 @@ USBKEYVAR=/dev/disk/by-uuid/{{ usbkey_uuid }}
 USBKEYSLOCATION={{ usbkey_keysdir }}
 
 # Figure out if path given is relative or absolute, assign variables accordingly
-if [[ "$(echo $1 | cut -c 1)" == "/" ]]; then 
-	# Absolute
-	ABSOLUTELOCATION=$1
-else
-	# Relative
-	ABSOLUTELOCATION="$(pwd)/$1"
-fi
+ABSOLUTELOCATION=$(realpath $1)
 # Probably cleaner to do this in awk or the like but good enough!
 FILEPARENTDIR="$(echo $ABSOLUTELOCATION | cut -d / --fields=$(echo $ABSOLUTELOCATION | grep -o / | wc -l))"
 FILENAME="$(echo $ABSOLUTELOCATION | cut -d / --fields=$(($(echo $ABSOLUTELOCATION | grep -o / | wc -l) + 1))-)"
diff --git a/home_resources/.local/bin/spark_ansible-viewvault.sh b/home_resources/.local/bin/spark_ansible-viewvault.sh
index 81c6be1..7e7631d 100755
--- a/home_resources/.local/bin/spark_ansible-viewvault.sh
+++ b/home_resources/.local/bin/spark_ansible-viewvault.sh
@@ -11,13 +11,7 @@ USBKEYVAR=/dev/disk/by-uuid/{{ usbkey_uuid }}
 USBKEYSLOCATION={{ usbkey_keysdir }}
 
 # Figure out if path given is relative or absolute, assign variables accordingly
-if [[ "$(echo $1 | cut -c 1)" == "/" ]]; then 
-	# Absolute
-	ABSOLUTELOCATION=$1
-else
-	# Relative
-	ABSOLUTELOCATION="$(pwd)/$1"
-fi
+ABSOLUTELOCATION=$(realpath $1)
 # Probably cleaner to do this in awk or the like but good enough!
 # FILEPARENTDIR="$(echo $ABSOLUTELOCATION | cut -d / --fields=$(echo $ABSOLUTELOCATION | grep -o / | wc -l))"
 FILENAME="$(echo $ABSOLUTELOCATION | cut -d / --fields=$(($(echo $ABSOLUTELOCATION | grep -o / | wc -l) + 1))-)"