X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=.bashrc;h=c27af43a08e607c9c6f863c551c552608add152d;hp=6780da6b0717979d282be522c1cba33a44d02eca;hb=386ec3bb9a0a35be10431d3da9fa21a1d9bc29e2;hpb=12e7a0f3de4f4f1b1f8e56e7cbe2e972027e0a42 diff --git a/.bashrc b/.bashrc index 6780da6..c27af43 100644 --- a/.bashrc +++ b/.bashrc @@ -55,17 +55,26 @@ else # this file, and we don't want to do that and cause an infinite # loop. fi - _x=$(readlink -f ${BASH_SOURCE[0]}) - _x=${_x%/*}/brc - if [[ -r $_x ]]; then + _tmp=$(readlink -f ${BASH_SOURCE[0]}) + _tmp=${_tmp%/*} + _tmp2=$_tmp/brc + if [[ -s $_tmp2 ]]; then # shellcheck source=./brc - source $_x + source $_tmp2 fi # brc2 is for things i dont necessarily want on every system - _x=${_x%/*}/brc2 - if [[ -r $_x ]]; then + _tmp2=$_tmp/brc2 + if [[ -s $_tmp2 ]]; then # shellcheck source=./brc2 - source $_x + source $_tmp2 + else + # This check is for when running the sl() command, + # and the remote host got its type misidentified. + _tmp2=$_tmp/../brc2 + if [[ -s $_tmp2 ]]; then + # shellcheck source=./brc2 + source $_tmp2 + fi fi fi # ensure no bad programs appending to this file will have an affect