From b876a993c32c951bb3078fc615adfae76e04b1e2 Mon Sep 17 00:00:00 2001 From: pyr0ball Date: Mon, 13 Mar 2023 15:18:34 -0700 Subject: [PATCH] changed settings file handling --- PRbL | 2 +- lib/skel/.bashrc.d/11-quickinfo.bashrc | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/PRbL b/PRbL index 93850ae..bba8e7a 160000 --- a/PRbL +++ b/PRbL @@ -1 +1 @@ -Subproject commit 93850ae1538c370dcdf8d6c39403292975077caa +Subproject commit bba8e7ad1c6dceb977618360dbd6aba8635f264f diff --git a/lib/skel/.bashrc.d/11-quickinfo.bashrc b/lib/skel/.bashrc.d/11-quickinfo.bashrc index 8cb89ee..24cb03e 100644 --- a/lib/skel/.bashrc.d/11-quickinfo.bashrc +++ b/lib/skel/.bashrc.d/11-quickinfo.bashrc @@ -9,7 +9,7 @@ # Written by Alan "pyr0ball" Weinstock # ############################################################### -quickinfo_version=2.0.2 +quickinfo_version=2.0.3 prbl_functons_req_ver=1.1.3 # 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) scriptname="${0##*/}" rundir="${0%/*}" -rundir_absolute=$(cd $rundir && pwd) -settingsfile=$(echo "$rundir_absolute/$scriptname" | sed -E 's/(.*)bashrc/\1settings/') +# If running on login as a bashrc, the above variables will not give this script's data +# 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 # check PRbL functions version