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))-)"