From 45d6a20eacba209fe9c44a239e0d4678533357e7 Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Sun, 11 Aug 2019 01:39:55 +0100
Subject: [PATCH] switched to late evaluation of variables embedded in aliases

---
 .bash.d/aliases.sh | 122 +++++++++++++++++++++++----------------------
 1 file changed, 63 insertions(+), 59 deletions(-)

diff --git a/.bash.d/aliases.sh b/.bash.d/aliases.sh
index 92c078bd..9af8754e 100644
--- a/.bash.d/aliases.sh
+++ b/.bash.d/aliases.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-#  shellcheck disable=SC2139
 #  vim:ts=4:sts=4:sw=4:et
 #
 #  Author: Hari Sekhon
@@ -15,15 +14,19 @@
 #
 
 # ============================================================================ #
-#                              Bash General Aliases
+#                         G e n e r a l   A l i a s e s
 # ============================================================================ #
 
+# manual local aliases
+# shellcheck disable=SC1090
+[ -f "$HOME/.aliases" ] && . "$HOME/.aliases"
+
 export bashrc=~/.bashrc
-alias r=". $bashrc"
-alias bashrc="$EDITOR $bashrc && r"
-alias vimrc="$EDITOR ~/.vimrc"
-alias screenrc="$EDITOR ~/.screenrc"
-alias aliases="$EDITOR $bashd/aliases.sh"
+alias r='. $bashrc'
+alias bashrc='$EDITOR $bashrc && r'
+alias vimrc='$EDITOR ~/.vimrc'
+alias screenrc='$EDITOR ~/.screenrc'
+alias aliases='$EDITOR $bashd/aliases.sh'
 alias ae=aliases
 alias be=bashrc
 alias ve=vimrc
@@ -31,21 +34,23 @@ alias se=screenrc
 
 # shellcheck disable=SC2154
 export bashd="$srcdir/.bash.d"
-alias bashd="cd $bashd"
+alias bashd='cd $bashd'
+
+#alias cleanshell='exec env - bash --rcfile /dev/null'
+alias cleanshell='exec env - bash --norc --noprofile'
+alias newshell='exec bash'
+alias rr='newshell'
 
-#alias cleanshell="exec env - bash --rcfile /dev/null"
-alias cleanshell="exec env - bash --norc --noprofile"
-alias newshell="exec bash"
-alias rr="newshell"
+alias record=script
 
-alias l33tmode="welcome; retmode=on; echo l33tm0de on"
+alias l33tmode='welcome; retmode=on; echo l33tm0de on'
 alias leetmode=l33tmode
 
 alias hist=history
-alias clhist="HISTSIZE=0; HISTSIZE=5000"
-alias nohist="unset HISTFILE"
+alias clhist='HISTSIZE=0; HISTSIZE=5000'
+alias nohist='unset HISTFILE'
 
-export LS_OPTIONS="-F"
+export LS_OPTIONS='-F'
 if [ -n "${APPLE:-}" ]; then
     export CLICOLOR=1 # equiv to using -G switch when calling
 else
@@ -53,69 +58,67 @@ else
     export PS_OPTIONS="$LS_OPTIONS -L"
 fi
 
-alias ls="ls $LS_OPTIONS"
+alias ls='ls $LS_OPTIONS'
 # omit . and .. in listall with -A instead of -a
-alias lA="ls -lA $LS_OPTIONS"
-alias la="ls -la $LS_OPTIONS"
-alias ll="ls -l $LS_OPTIONS"
-alias lh="ls -lh $LS_OPTIONS"
-alias lr="ls -ltrh $LS_OPTIONS"
-
-alias cd..="cd .."
-alias ..="cd .."
-alias ...="cd ../.."
-alias ....="cd ../../.."
+alias lA='ls -lA $LS_OPTIONS'
+alias la='ls -la $LS_OPTIONS'
+alias ll='ls -l $LS_OPTIONS'
+alias lh='ls -lh $LS_OPTIONS'
+alias lr='ls -ltrh $LS_OPTIONS'
+
+alias cd..='cd ..'
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
 # use bare 'cd' instead, it's more standard
-#alias ~="cd ~"
-
-alias mv="mv -i"
-alias cp="cp -i"
-#alias rm="rm -i"
-alias less="less -i"
-alias l="less"
-alias m="more"
-alias vi="vim"
-alias grep="grep --color=auto"
-alias hosts="sudo $EDITOR /etc/hosts"
-alias screen="screen -T $TERM"
+#alias ~='cd ~'
+
+alias mv='mv -i'
+alias cp='cp -i'
+#alias rm='rm -i'
+alias less='less -i'
+alias l='less'
+alias m='more'
+alias vi='vim'
+alias grep='grep --color=auto'
+alias hosts='sudo $EDITOR /etc/hosts'
+alias screen='screen -T $TERM'
 #alias mt=multitail
-#alias halt="shutdown -h now -P"
+#alias halt='shutdown -h now -P'
 # my pytools github repo
-alias ht="headtail.py"
+alias ht='headtail.py'
 
-alias a="ansible"
-alias bc="bc -l"
-alias chromekill="pkill -f 'Google Chrome Helper'"
-alias eclipse="|/eclipse/Eclipse.app/Contents/MacOS/eclipse";
-alias visualvm="~/visualvm/bin/visualvm"
+alias a='ansible'
+alias bc='bc -l'
+alias chromekill='pkill -f "Google Chrome Helper"'
+alias eclipse='~/eclipse/Eclipse.app/Contents/MacOS/eclipse';
+alias visualvm='~/visualvm/bin/visualvm'
 
 # for piping from grep
 alias uniqfiles="sed 's/:.*//;/^[[:space:]]*$/d' | sort -u"
 
 export etc=~/etc
-alias etc="cd $etc"
+alias etc='cd $etc'
 
-alias distro="cat /etc/*release /etc/*version 2>/dev/null"
+alias distro='cat /etc/*release /etc/*version 2>/dev/null'
 alias trace=traceroute
-alias t="$EDITOR $HOME/tmp"
+alias t='$EDITOR $HOME/tmp'
 # causes more problems than it solves on a slow machine missing the prompt
 #alias y=yes
-alias t2="$EDITOR $HOME/tmp2"
-alias t3="$EDITOR $HOME/tmp3"
-alias tg="traceroute www.google.com"
-#alias sec="ps -ef| grep -e arpwatc[h] -e swatc[h] -e scanlog[d]"
+alias t2='$EDITOR $HOME/tmp2'
+alias t3='$EDITOR $HOME/tmp3'
+alias tg='traceroute www.google.com'
+#alias sec='ps -ef| grep -e arpwatc[h] -e swatc[h] -e scanlog[d]'
 
 export lab=~/lab
-alias lab="cd $lab"
+alias lab='cd $lab'
 
-alias jenkins_cli="java -jar ~/jenkins-cli.jar -s http://jenkins:8080"
+alias jenkins_cli='java -jar ~/jenkins-cli.jar -s http://jenkins:8080'
 alias backup_jenkins="rsync -av root@jenkins:/jenkins_backup/*.zip '~/jenkins_backup/'"
 
-alias record=script
-
 export downloads=~/Downloads
 export down="$downloads"
-alias Down="cd $downloads"
+alias Down='cd $downloads'
 alias down=Down
 
 alias desktop=Desktop
@@ -125,6 +128,7 @@ for v in ~/github/pytools/validate_*.py; do
     z="${v##*/}"
     z="${z#validate_}"
     z="${z%.py}"
-    # shellcheck disable=SC2140
+    # needs to expand now for dynamic alias creation
+    # shellcheck disable=SC2139,SC2140
     alias "v$z"="$v"
 done