.

shared/bash_profile

@@ -1,265 +1,4 @@
-# Source .bashrc for non-interactive Bash shells
+if [ -f ~/.bashrc ]; then
-export BASH_ENV=~/.bashrc
+    source ~/.bashrc
-
-
-if [[ $- != *i* ]] ; then
-  # Shell is non-interactive.  Be done now!
-  return
 fi
 
-
-
-# History control
-# don't use duplicate lines or lines starting with space
-HISTCONTROL=ignoreboth
-HISTSIZE=1000
-HISTFILESIZE=2000
-# append to the history file instead of overwrite
-shopt -s histappend
-
-_setpath() {
-  for i in /usr/local/bin /usr/local/sbin /usr/local/sqlite/bin
-  do
-    # Move these paths to the front
-    PATH=$(echo $PATH | sed -e "s#$i##g")
-    if [ -d $i ]; then
-      PATH=$i:$PATH
-    fi
-  done
-
-  PATH=`echo $PATH | sed -e 's/^\://' -e 's/\:\:/:/g'`
-
-  export PATH
-}
-
-_setldpath() {
-  for i in /usr/local/sqlite/lib /usr/local/lib
-  do
-    # Move these paths to the front
-    LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | sed -e "s#$i##g")
-    if [ -d $i ]; then
-      LD_LIBRARY_PATH=$i:$LD_LIBRARY_PATH
-    fi
-  done
-
-  LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed -e 's/^\://' -e 's/\:\:/:/g'`
-
-  export LD_LIBRARY_PATH
-}
-
-_setldrunpath() {
-  for i in /usr/local/sqlite/lib 
-  do
-    # Move these paths to the front
-    LD_RUN_PATH=$(echo $LD_RUN_PATH | sed -e "s#$i##g")
-    if [ -d $i ]; then
-      LD_RUN_PATH=$i:$LD_RUN_PATH
-    fi
-  done
-
-  LD_RUN_PATH=`echo $LD_RUN_PATH | sed -e 's/^\://' -e 's/\:\:/:/g'`
-
-  export LD_RUN_PATH
-}
-
-_setaliases() {
-  case "$THISOS" in
-    darwin)
-        # Use MacVim's terminal vim for awesomeness support
-        hash rvim 2>/dev/null  && alias vim=rvim
-        FIND_EGREP="-E .";
-        LS_COLORFLAG='-G'
-        ;;
-    linux)
-        alias ls='ls -G'
-        FIND_EGREP=". -regextype posix-egrep";
-        LS_COLORFLAG='--color=auto'
-        ;;
-  esac
-
-  alias ls="ls $LS_COLORFLAG"
-  alias ll='ls -hl'
-  alias l.='ls -d .* --color=auto'
-  alias tree='tree -C'
-
-  alias cruft="find $FIND_EGREP -regex '.*swo|.*swp|.*pyc|.*pyo|.*~' -exec rm {} \;"
-
-  alias p="ps aux |grep "
-  alias grep="grep --color=auto"
-
-  alias facts="echo -ne '\033[36m'; curl -s randomfunfacts.com | grep '<i>' | sed 's/.*<i>\(.*\)<\/i>.*/\1/'; echo -ne '\033[0m'; tput sgr0"
-
-  # show numeric permissions
-  FORMATFLAG="-c"
-  if ( uname -a | grep Darwin >/dev/null); then
-    FORMATFLAG="-f"
-  fi
-  alias perms="stat $FORMATFLAG '%A %a %n' *"
-
-
-  alias .bashrc='source ~/.bashrc'
-
-  alias path='echo -e ${PATH//:/\\n}'
-}
-
-_setlocalaliases() {
-  case "$THISHOST" in
-    MINT660)
-        alias ansible-playbook='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-playbook'
-        alias ansible-lint='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-lint'
-        alias vgit='docker run -ti --rm -v ${HOME}:/root -v $(pwd):/git alpine/git "$@" '
-        alias mycicd='/volume17/zNFS2/Sync${THISHOST}/zNFS2/zDocky/mycicd.sh'
-        ;;
-    MINT661)
-        alias ansible-playbook='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-playbook'
-        alias ansible-lint='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-lint'
-        alias vgit='docker run -ti --rm -v ${HOME}:/root -v $(pwd):/git alpine/git "$@" '
-        alias mycicd='/volume12/zTools/Sync${THISHOST}/zTools/zDocky/mycicd.sh'
-        ;;
-    MINT662)
-        alias ansible-playbook='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-playbook'
-        alias ansible-lint='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-lint'
-        alias vgit='docker run -ti --rm -v ${HOME}:/root -v $(pwd):/git alpine/git "$@" '
-        alias mycicd='/volume12/zTools/Sync${THISHOST}/zTools/zDocky/mycicd.sh'
-        ;;
-    MINT663)
-        alias ansible-playbook='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-playbook'
-        alias ansible-lint='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-lint'
-        alias vgit='docker run -ti --rm -v ${HOME}:/root -v $(pwd):/git alpine/git "$@" '
-        alias mycicd='/volume12/zTools/Sync${THISHOST}/zTools/zDocky/mycicd.sh'
-        ;;
-  esac
-}
-
-_setprompt() {
-  SAVEHISTORY="history -a"
-  SETWINDOWTITLE='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
-
-  TMUXCMD=''
-  if [ -n $TMUX ]; then
-    TMUXENV='tmux set-environment -g CWD "$PWD"'
-    TMUXPATH='tmux set-option default-path $PWD'
-    TMUXCMD="($TMUXENV 2>/dev/null && $TMUXPATH 2>/dev/null >&2)"
-  fi
-
-  export PROMPT_COMMAND="$SETWINDOWTITLE;$SAVEHISTORY;$TMUXCMD"
-
-  # Reset
-  Color_Off='\[\e[0m\]'       # Text Reset
-
-  # Regular Colors
-  Black='\[\e[0;30m\]'        # Black
-  Red='\[\e[0;31m\]'          # Red
-  Green='\[\e[0;32m\]'        # Green
-  Yellow='\[\e[0;33m\]'       # Yellow
-  Blue='\[\e[0;34m\]'         # Blue
-  Purple='\[\e[0;35m\]'       # Purple
-  Cyan='\[\e[0;36m\]'         # Cyan
-  White='\[\e[0;37m\]'        # White
-  NEWLINE="\n"
-
-  # Use for chroots, venvs, or other info that should be stuck in the prompt
-  EXTRAPROMPT=$2
-
-  case "$1" in
-    simple)
-      export PS1="\[\[\e[32;1m\]\h$EXTRAPROMPT \W> \[\e[0m\]"
-      ;;
-    2line)
-      # Default PROMPT_COLOR values
-      C1=${Yellow}
-      C2=${Blue}
-
-      # ┌(jer@myhost)─(✗)─(10:18 PM Sun Apr 14)
-      # └─(~/dev/git/myproject)─>
-      DASH="\342\224\200"
-      X="\342\234\227"
-      ERRCODE="\$([[ \$? != 0 ]] && echo \"${DASH}(${Red}${X}${White})\")${DASH}"
-
-      LINE1="${White}\342\224\214(${C1}\u@\h$EXTRAPROMPT${White})${ERRCODE}(${C1}\@ \d${White})"
-      LINE2="\342\224\224\342\224\200(${C2}\w${White})-> "
-      export PS1="${NEWLINE}${LINE1}${NEWLINE}${LINE2}${Color_Off}"
-      ;;
-    3line)
-      _setprompt 2line
-      export PS1="$PS1${NEWLINE}${White}\342\224\224\342\224\200>${Color_Off} "
-      ;;
-  esac
-
-}
-
-_sethistory() {
-  export HISTFILE=~/.bash_history
-  export HISTSIZE=10000
-  export HISTFILESIZE=${HISTSIZE}
-  export HISTCONTROL=ignoredups:ignorespace
-  shopt -s histappend
-
-  # Do *not* append the following to our history:
-  HISTIGNORE='\&:fg:bg:ls:pwd:cd ..:cd ~-:cd -:cd:jobs:set -x:ls -l:ls -l'
-  HISTIGNORE=${HISTIGNORE}':%1:%2:popd:top:shutdown*'
-  export HISTIGNORE
-
-  # Save multi-line commands in history as single line
-  shopt -s cmdhist
-}
-
-
-
-_manpagecolor() {
-  export LESS_TERMCAP_mb=$'\E[01;31m'
-  export LESS_TERMCAP_md=$'\E[01;31m'
-  export LESS_TERMCAP_me=$'\E[0m'
-  export LESS_TERMCAP_se=$'\E[0m'
-  export LESS_TERMCAP_so=$'\E[01;44;33m'
-  export LESS_TERMCAP_ue=$'\E[0m'
-  export LESS_TERMCAP_us=$'\E[01;32m'
-}
-
-
-THISOS=$(uname | awk '{print tolower($1)}')
-THISHOST=$(uname -n)
-
-_setpath
-_setldpath
-_setldrunpath
-_setaliases
-_setlocalaliases
-_setprompt 2line
-_sethistory
-_moreless
-_manpagecolor
-
-#en_US.UTF8
-LANG=C
-LANGUAGE=C
-LC_ALL=C
-LC_COLLATE=C
-LC_CTYPE=C
-LC_MESSAGES=C
-
-export LC_CTYPE LC_MESSAGES LC_COLLATE LC_ALL LANGUAGE LANG 
-
-EDITOR=vi
-export EDITOR
-
-
-# Correct minor spelling errors in cd commands
-shopt -s cdspell
-# Enable egrep-style pattern matching
-shopt -s extglob
-shopt -s checkwinsize
-
-export CLICOLOR=1
-export LSCOLORS=ExFxCxDxBxegedabagacad
-#export TERM=ansi
-export TERM=xterm-256color
-#export PIP_REQUIRE_VIRTUALENV=true
-
-export ANSIBLE_STDOUT_CALLBACK=yaml
-export GPODDER_HOME=~/DocumentsPodcasts/config
-export GPODDER_DOWNLOAD_DIR=~/DocumentsPodcasts/downloads
-
-PATH=${PATH}:.local/bin ; export PATH
-export SIGNAL_PHONE_NUMBER=
-

shared/bashrc

@@ -150,28 +150,28 @@ _setaliases() {
 _setlocalaliases() {
   case "$THISHOST" in
     MINT660)
-        alias ansible-playbook='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-playbook'
+        alias ansible-playbook='docker run -it --rm -v /zz/zAnsible:/ansible ansible:latest ansible-playbook'
-        alias ansible-lint='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-lint'
+        alias ansible-lint='docker run -it --rm -v /zz/zAnsible:/ansible ansible:latest ansible-lint'
         alias vgit='docker run -ti --rm -v ${HOME}:/root -v $(pwd):/git alpine/git "$@" '
-        alias mycicd='/volume17/zNFS2/Sync${THISHOST}/zNFS2/zDocky/mycicd.sh'
+        alias mycicd='/zz/zDocky/mycicd.sh'
         ;;
     MINT661)
-        alias ansible-playbook='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-playbook'
+        alias ansible-playbook='docker run -it --rm -v /zz/zAnsible:/ansible ansible:latest ansible-playbook'
-        alias ansible-lint='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-lint'
+        alias ansible-lint='docker run -it --rm -v /zz/zAnsible:/ansible ansible:latest ansible-lint'
         alias vgit='docker run -ti --rm -v ${HOME}:/root -v $(pwd):/git alpine/git "$@" '
-        alias mycicd='/volume12/zTools/Sync${THISHOST}/zTools/zDocky/mycicd.sh'
+        alias mycicd='/zz/zDocky/mycicd.sh'
         ;;
     MINT662)
-        alias ansible-playbook='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-playbook'
+        alias ansible-playbook='docker run -it --rm -v /zz/zAnsible:/ansible ansible:latest ansible-playbook'
-        alias ansible-lint='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-lint'
+        alias ansible-lint='docker run -it --rm -v /zz/zAnsible:/ansible ansible:latest ansible-lint'
         alias vgit='docker run -ti --rm -v ${HOME}:/root -v $(pwd):/git alpine/git "$@" '
-        alias mycicd='/volume12/zTools/Sync${THISHOST}/zTools/zDocky/mycicd.sh'
+        alias mycicd='/zz/zDocky/mycicd.sh'
         ;;
     MINT663)
-        alias ansible-playbook='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-playbook'
+        alias ansible-playbook='docker run -it --rm -v /zz/zAnsible:/ansible ansible:latest ansible-playbook'
-        alias ansible-lint='docker run -it --rm -v /volume12/zTools/Sync${THISHOST}/zTools/zAnsible:/ansible dansible:latest ansible-lint'
+        alias ansible-lint='docker run -it --rm -v /zz/zAnsible:/ansible ansible:latest ansible-lint'
         alias vgit='docker run -ti --rm -v ${HOME}:/root -v $(pwd):/git alpine/git "$@" '
-        alias mycicd='/volume12/zTools/Sync${THISHOST}/zTools/zDocky/mycicd.sh'
+        alias mycicd='/zz/zDocky/mycicd.sh'
         ;;
   esac
 }
@@ -464,6 +464,7 @@ _sethistory
 _moreless
 _manpagecolor
 
+EDITOR=vi
 export EDITOR=vim
 
 # Correct minor spelling errors in cd commands
@@ -491,5 +492,5 @@ export GPODDER_HOME=~/DocumentsPodcasts/config
 export GPODDER_DOWNLOAD_DIR=~/DocumentsPodcasts/downloads
 
 PATH=${PATH}:.local/bin ; export PATH
-export SIGNAL_PHONE_NUMBER=+447761475272
+export SIGNAL_PHONE_NUMBER=