stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hostname: fix LP_ENABLE_SSH_COLORS

Browse Source 
Colorization of the hostname based on a hash of the name was broken for
some time because t_setaf was not available where LP_COLOR_SSH was used.
This commit is contained in:
Olivier Mengué 2014-07-01 00:32:46 +02:00
parent d5ac06e711
commit 9633ac83ca
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
liquidprompt
View File

@ -248,6 +248,12 @@ _lp_source_config()
# NO_COL is special: it will be used at runtime, not just during config loading # NO_COL is special: it will be used at runtime, not just during config loading
NO_COL="${_LP_OPEN_ESC}${ti_sgr0}${_LP_CLOSE_ESC}" NO_COL="${_LP_OPEN_ESC}${ti_sgr0}${_LP_CLOSE_ESC}"
# compute the hash of the hostname
# and get the corresponding number in [1-6] (red,green,yellow,blue,purple or cyan)
# FIXME check portability of cksum and add more formats (bold? 256 colors?)
local hash=$(( 1 + $(hostname | cksum | cut -d " " -f 1) % 6 ))
LP_COLOR_HOST_HASH="${_LP_OPEN_ESC}$(ti_setaf $hash)${_LP_CLOSE_ESC}"
unset ti_sgr0 ti_bold ti_setaf ti_setab unset ti_sgr0 ti_bold ti_setaf ti_setab
@ -525,19 +531,8 @@ lcl)
;; ;;
ssh) ssh)
# If we want a different color for each host # If we want a different color for each host
if [[ "$LP_ENABLE_SSH_COLORS" -eq "1" ]]; then [[ "$LP_ENABLE_SSH_COLORS" -eq 1 ]] && LP_COLOR_SSH="$LP_COLOR_HOST_HASH"
# compute the hash of the hostname LP_HOST="${LP_HOST}${LP_COLOR_SSH}${_LP_HOST_SYMBOL}${NO_COL}"
# and get the corresponding number in [1-6] (red,green,yellow,blue,purple or cyan)
# FIXME check portability of cksum and add more formats (bold? 256 colors?)
hash=$(( 1 + $(hostname | cksum | cut -d " " -f 1) % 6 ))
color=${_LP_OPEN_ESC}$(ti_setaf $hash)${_LP_CLOSE_ESC}
LP_HOST="${LP_HOST}${color}${_LP_HOST_SYMBOL}${NO_COL}"
unset hash
unset color
else
# the same color for all hosts
LP_HOST="${LP_HOST}${LP_COLOR_SSH}${_LP_HOST_SYMBOL}${NO_COL}"
fi
;; ;;
su) su)
LP_HOST="${LP_HOST}${LP_COLOR_SU}${_LP_HOST_SYMBOL}${NO_COL}" LP_HOST="${LP_HOST}${LP_COLOR_SU}${_LP_HOST_SYMBOL}${NO_COL}"