|
|
|
@ -61,7 +61,7 @@ fi
|
|
|
|
|
|
|
|
|
|
bash_tools="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
# shellcheck disable=SC1090,SC1091
|
|
|
|
|
. "$bash_tools/.bash.d/os_detection.sh"
|
|
|
|
|
|
|
|
|
|
# enable color support for ls
|
|
|
|
@ -84,7 +84,7 @@ export BASH_SILENCE_DEPRECATION_WARNING=1
|
|
|
|
|
|
|
|
|
|
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
# shellcheck disable=SC1090,SC1091
|
|
|
|
|
[ -f "$HOME/.aliases" ] && source "$HOME/.aliases"
|
|
|
|
|
|
|
|
|
|
# ============================================================================ #
|
|
|
|
@ -141,7 +141,7 @@ if [ $EUID -eq 0 ]; then
|
|
|
|
|
sudo=""
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
# shellcheck disable=SC1090,SC1091
|
|
|
|
|
type add_PATH &>/dev/null || . "$bash_tools/.bash.d/paths.sh"
|
|
|
|
|
|
|
|
|
|
# ============================================================================ #
|
|
|
|
@ -149,7 +149,7 @@ type add_PATH &>/dev/null || . "$bash_tools/.bash.d/paths.sh"
|
|
|
|
|
# want this to fail is there is no match because we should always have local .bash.d/*.sh in this repo
|
|
|
|
|
# shopt -s nullglob
|
|
|
|
|
for src in "$bash_tools/.bash.d/"*.sh; do
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
# shellcheck disable=SC1090,SC1091
|
|
|
|
|
. "$src"
|
|
|
|
|
done
|
|
|
|
|
# shopt -u nullglob
|
|
|
|
@ -157,12 +157,12 @@ done
|
|
|
|
|
# added by travis gem - should be in ~/.bashrc so not needed to duplicate here
|
|
|
|
|
#[ -f /Users/hari.sekhon/.travis/travis.sh ] && source /Users/hari.sekhon/.travis/travis.sh
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
# shellcheck disable=SC1090,SC1091
|
|
|
|
|
[ -f "$HOME/.bashrc.local" ] && . "$HOME/.bashrc.local"
|
|
|
|
|
if [ -d "$HOME/.bash.d" ]; then
|
|
|
|
|
shopt -s nullglob
|
|
|
|
|
for src in "$HOME/.bash.d/"*.sh; do
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
# shellcheck disable=SC1090,SC1091
|
|
|
|
|
. "$src"
|
|
|
|
|
done
|
|
|
|
|
shopt -u nullglob
|
|
|
|
@ -170,7 +170,7 @@ fi
|
|
|
|
|
if [ -d "$HOME/.bash.autocomplete.d" ]; then
|
|
|
|
|
shopt -s nullglob
|
|
|
|
|
for src in "$HOME/.bash.autocomplete.d/"*.sh; do
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
# shellcheck disable=SC1090,SC1091
|
|
|
|
|
. "$src"
|
|
|
|
|
done
|
|
|
|
|
shopt -u nullglob
|
|
|
|
|