Merge branch 'master' of ssh://git.cz0.cz:2222/czoczo/BetterBash

prompt/bb.sh

@@ -48,7 +48,6 @@ function hashColor {
   echo -e '\[\033[1;97m\]'
 }
 
-CH=$(hashColor "$(cat /etc/hostname)" 4)
 
 temp="$(tty)"
 #   Chop off the first five chars of tty (ie /dev/):
@@ -59,16 +58,18 @@ HBAR="─"
 PR_ULCORNER="┌"
 PR_LLCORNER="└"
 
-PRIMARY_COLOR='\[\033[00;92m\]'
-SECONDARY_COLOR='\[\033[00;95;1m\]'
-ROOT_COLOR='\[\033[00;31;1m\]'
-TIME_COLOR='\[\033[00;93;1m\]'
-ERR_COLOR='\[\033[00;31;1m\]'
-WHITEB='\[\033[00;97;1m\]'
-RST='\[\033[0m\]'
-BORDCOL='\[\033[00;90;1m\]'
+# Defaults:
+[ -z "${PRIMARY_COLOR}" ] && PRIMARY_COLOR='\[\033[00;92m\]'
+[ -z "${SECONDARY_COLOR}" ] && SECONDARY_COLOR='\[\033[00;95;1m\]'
+[ -z "${ROOT_COLOR}" ] && ROOT_COLOR='\[\033[00;31;1m\]'
+[ -z "${TIME_COLOR}" ] && TIME_COLOR='\[\033[00;93;1m\]'
+[ -z "${ERR_COLOR}" ] && ERR_COLOR='\[\033[00;31;1m\]'
+[ -z "${SEPARATOR_COLOR}" ] && SEPARATOR_COLOR='\[\033[00;97;1m\]'
+[ -z "${RST=}" ] && RST='\[\033[0m\]'
+[ -z "${BORDCOL}" ] && BORDCOL='\[\033[00;90;1m\]'
+[ -z "${PATH_COLOR}" ] && PATH_COLOR='\[\033[00;97;1m\]'
+[ -z "${AVATAR}" ] && AVATAR='true'
 USERCOL=$SECONDARY_COLOR
-PATH_COLOR=$WHITEB
 
 export GIT_PS1_SHOWCOLORHINTS=true
 export GIT_PS1_SHOWDIRTYSTATE=true
@@ -77,6 +78,14 @@ export GIT_PS1_SHOWUPSTREAM="auto"
 
 export PROMPT_COMMAND=__prompt_command
 
+CH=''
+CHLINE=''
+
+if [ "$AVATAR" == 'true' ]; then
+  CH=$(hashColor "$(cat /etc/hostname)" 4)
+  CHLINE="$SEPARATOR_COLOR($CH$SEPARATOR_COLOR)"
+fi
+
 function __prompt_command() {
   local RETURN_CODE="$?"
   PS1=""
@@ -84,7 +93,7 @@ function __prompt_command() {
   RCOL="${PRIMARY_COLOR}"
   EXIT="$HBAR$HBAR$HBAR$HBAR$HBAR"
   if [[ $RETURN_CODE != 0 ]]; then
-     EXIT="$WHITEB(${ERR_COLOR}$RETURN_CODE ↵$WHITEB)"
+     EXIT="$SEPARATOR_COLOR(${ERR_COLOR}$RETURN_CODE ↵$SEPARATOR_COLOR)"
      RCOL="${ERR_COLOR}"
   fi
 
@@ -99,7 +108,7 @@ function __prompt_command() {
     PROC_WIDTH=0
   if [ "$PROCCNT" -ne "0" ]; then
     #BGPROCCOL='\033[1;95;5m'
-    BGPROCCOL="$BORDCOL$HBAR$HBAR$WHITEB(${SECONDARY_COLOR}\j ↻$WHITEB)"
+    BGPROCCOL="$BORDCOL$HBAR$HBAR$SEPARATOR_COLOR(${SECONDARY_COLOR}\j ↻$SEPARATOR_COLOR)"
   fi
 
   [ -n "${BGPROCCOL}" ] && PROC_WIDTH=7
@@ -108,15 +117,18 @@ function __prompt_command() {
 
   GITPROMPT=$(__git_ps1 " on${PRIMARY_COLOR} %s")
 
-  LEFT="\n$BORDCOL\[\016\]$PR_ULCORNER$HBAR\[\017\]$WHITEB($USERCOL$USER$WHITEB@${PRIMARY_COLOR}\h:$cur_tty$WHITEB)$BORDCOL$HBAR$HBAR$WHITEB($CH$WHITEB)$BGPROCCOL"
+  LEFT="\n$BORDCOL\[\016\]$PR_ULCORNER$HBAR\[\017\]$SEPARATOR_COLOR($USERCOL$USER$SEPARATOR_COLOR@${PRIMARY_COLOR}\h:$cur_tty$SEPARATOR_COLOR)$BORDCOL$HBAR$HBAR$CHLINE$BGPROCCOL"
 
-  RIGHT="$EXIT$BORDCOL$HBAR$HBAR$HBAR$WHITEB($TIME_COLOR\d$WHITEB)$BORDCOL$HBAR$HBAR$HBAR$WHITEB($RCOL\t$WHITEB)$BORDCOL$HBAR$HBAR$HBAR$HBAR\n$BORDCOL\[\016\]$PR_LLCORNER\[\017\]$BORDCOL$HBAR$WHITEB(${PATH_COLOR}\w${WHITE})$BORDCOL$HBAR$WHITEB(${PRIMARY_COLOR}\\\$$RST$GITPROMPT$WHITEB)$BORDCOL-> \[\e[0m\]"
+  RIGHT="$EXIT$BORDCOL$HBAR$HBAR$HBAR$SEPARATOR_COLOR($TIME_COLOR\d$SEPARATOR_COLOR)$BORDCOL$HBAR$HBAR$HBAR$SEPARATOR_COLOR($RCOL\t$SEPARATOR_COLOR)$BORDCOL$HBAR$HBAR$HBAR$HBAR\n$BORDCOL\[\016\]$PR_LLCORNER\[\017\]$BORDCOL$HBAR$SEPARATOR_COLOR(${PATH_COLOR}\w${SEPARATOR_COLOR})$BORDCOL$HBAR$SEPARATOR_COLOR(${PRIMARY_COLOR}\\\$$RST$GITPROMPT$SEPARATOR_COLOR)$BORDCOL-> \[\e[0m\]"
 
   L_LEN="$USER$HOSTNAM$CH"
   R_LEN="XXX XXX XX, XX:XX:XX$RETURN_CODE"
   L_LEN=${#L_LEN}
   R_LEN=${#R_LEN}
   let WIDTH=$(tput cols)-${R_LEN}-${L_LEN}-${PROC_WIDTH}+83
+  if [ "$AVATAR" != 'true' ]; then
+    let WIDTH=${WIDTH}-116
+  fi
   FILL=$BORDCOL$HBAR
   for ((x = 0; x < $WIDTH; x++)); do
     FILL="$FILL$HBAR"