changed settings file handling

This commit is contained in:
pyr0ball 2023-03-13 15:18:34 -07:00
parent c8df2ace5a
commit b876a993c3
2 changed files with 10 additions and 4 deletions

2
PRbL

@ -1 +1 @@
Subproject commit 93850ae1538c370dcdf8d6c39403292975077caa Subproject commit bba8e7ad1c6dceb977618360dbd6aba8635f264f

View file

@ -9,7 +9,7 @@
# Written by Alan "pyr0ball" Weinstock # # Written by Alan "pyr0ball" Weinstock #
############################################################### ###############################################################
quickinfo_version=2.0.2 quickinfo_version=2.0.3
prbl_functons_req_ver=1.1.3 prbl_functons_req_ver=1.1.3
# Uses a wide variety of methods to check which distro this is run on # Uses a wide variety of methods to check which distro this is run on
@ -58,8 +58,14 @@ fi
# Locate and import settings (shares same name with script apart from file extension) # Locate and import settings (shares same name with script apart from file extension)
scriptname="${0##*/}" scriptname="${0##*/}"
rundir="${0%/*}" rundir="${0%/*}"
rundir_absolute=$(cd $rundir && pwd) # If running on login as a bashrc, the above variables will not give this script's data
settingsfile=$(echo "$rundir_absolute/$scriptname" | sed -E 's/(.*)bashrc/\1settings/') # Failover hardcoded settings location for now
if ! [[ $scriptname =~ "-bash" ]] ; then
rundir_absolute=$(cd $rundir && pwd)
settingsfile=$(echo "$rundir_absolute/$scriptname" | sed -E 's/(.*)bashrc/\1settings/')
else
settingsfile="$HOME/.bashrc.d/11-quickinfo.settings"
fi
source $settingsfile source $settingsfile
# check PRbL functions version # check PRbL functions version