Merge pull request #31 from jaesivsm/master
Bugfix _LP_OPEN_ESC, use nproc, prepare themes
This commit is contained in:
nojhan
commit
82ee96a63a
94
liquidprompt
94
liquidprompt
@ -56,12 +56,12 @@ if [[ "$_LP_WORKING_SHELL" == "bash" ]]; then
|
||||
unset bash bmajor bminor
|
||||
|
||||
_LP_OPEN_ESC="\["
|
||||
_LP_OPEN_ESC="\]"
|
||||
_LP_CLOSE_ESC="\]"
|
||||
_LP_USER_SYMBOL="\u"
|
||||
_LP_HOST_SYMBOL="\h"
|
||||
elif [[ "$_LP_WORKING_SHELL" == "zsh" ]]; then
|
||||
_LP_OPEN_ESC="%{"
|
||||
_LP_OPEN_ESC="%}"
|
||||
_LP_CLOSE_ESC="%}"
|
||||
_LP_USER_SYMBOL="%n"
|
||||
_LP_HOST_SYMBOL="%m"
|
||||
fi
|
||||
@ -131,78 +131,62 @@ esac
|
||||
# Colors declarations
|
||||
if [[ "$LP_OS" == "FreeBSD" ]] ; then
|
||||
|
||||
BLACK="${_LP_OPEN_ESC}$(tput AF 0)${_LP_OPEN_ESC}"
|
||||
BOLD_GRAY="${_LP_OPEN_ESC}$(tput md ; tput AF 0)${_LP_OPEN_ESC}"
|
||||
WHITE="${_LP_OPEN_ESC}$(tput AF 7)${_LP_OPEN_ESC}"
|
||||
BOLD_WHITE="${_LP_OPEN_ESC}$(tput md ; tput AF 7)${_LP_OPEN_ESC}"
|
||||
BOLD="${_LP_OPEN_ESC}$(tput md)${_LP_CLOSE_ESC}"
|
||||
|
||||
RED="${_LP_OPEN_ESC}$(tput AF 1)${_LP_OPEN_ESC}"
|
||||
BOLD_RED="${_LP_OPEN_ESC}$(tput md ; tput AF 1)${_LP_OPEN_ESC}"
|
||||
WARN_RED="${_LP_OPEN_ESC}$(tput AF 0 ; tput setab 1)${_LP_OPEN_ESC}"
|
||||
CRIT_RED="${_LP_OPEN_ESC}$(tput md; tput AF 7 ; tput setab 1)${_LP_OPEN_ESC}"
|
||||
RED="${_LP_OPEN_ESC}$(tput AF 1)${_LP_CLOSE_ESC}"
|
||||
BOLD_RED="${_LP_OPEN_ESC}$(tput md ; tput AF 1)${_LP_CLOSE_ESC}"
|
||||
WARN_RED="${_LP_OPEN_ESC}$(tput AF 0 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
CRIT_RED="${_LP_OPEN_ESC}$(tput md; tput AF 7 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
|
||||
GREEN="${_LP_OPEN_ESC}$(tput AF 2)${_LP_OPEN_ESC}"
|
||||
BOLD_GREEN="${_LP_OPEN_ESC}$(tput md ; tput AF 2)${_LP_OPEN_ESC}"
|
||||
GREEN="${_LP_OPEN_ESC}$(tput AF 2)${_LP_CLOSE_ESC}"
|
||||
BOLD_GREEN="${_LP_OPEN_ESC}$(tput md ; tput AF 2)${_LP_CLOSE_ESC}"
|
||||
|
||||
YELLOW="${_LP_OPEN_ESC}$(tput AF 3)${_LP_OPEN_ESC}"
|
||||
BOLD_YELLOW="${_LP_OPEN_ESC}$(tput md ; tput AF 3)${_LP_OPEN_ESC}"
|
||||
YELLOW="${_LP_OPEN_ESC}$(tput AF 3)${_LP_CLOSE_ESC}"
|
||||
BOLD_YELLOW="${_LP_OPEN_ESC}$(tput md ; tput AF 3)${_LP_CLOSE_ESC}"
|
||||
|
||||
BLUE="${_LP_OPEN_ESC}$(tput AF 4)${_LP_OPEN_ESC}"
|
||||
BOLD_BLUE="${_LP_OPEN_ESC}$(tput md ; tput AF 4)${_LP_OPEN_ESC}"
|
||||
BLUE="${_LP_OPEN_ESC}$(tput AF 4)${_LP_CLOSE_ESC}"
|
||||
BOLD_BLUE="${_LP_OPEN_ESC}$(tput md ; tput AF 4)${_LP_CLOSE_ESC}"
|
||||
|
||||
PURPLE="${_LP_OPEN_ESC}$(tput AF 5)${_LP_OPEN_ESC}"
|
||||
PINK="${_LP_OPEN_ESC}$(tput md ; tput AF 5)${_LP_OPEN_ESC}"
|
||||
PURPLE="${_LP_OPEN_ESC}$(tput AF 5)${_LP_CLOSE_ESC}"
|
||||
PINK="${_LP_OPEN_ESC}$(tput md ; tput AF 5)${_LP_CLOSE_ESC}"
|
||||
|
||||
CYAN="${_LP_OPEN_ESC}$(tput AF 6)${_LP_OPEN_ESC}"
|
||||
BOLD_CYAN="${_LP_OPEN_ESC}$(tput md ; tput AF 6)${_LP_OPEN_ESC}"
|
||||
CYAN="${_LP_OPEN_ESC}$(tput AF 6)${_LP_CLOSE_ESC}"
|
||||
BOLD_CYAN="${_LP_OPEN_ESC}$(tput md ; tput AF 6)${_LP_CLOSE_ESC}"
|
||||
|
||||
NO_COL="${_LP_OPEN_ESC}$(tput me)${_LP_OPEN_ESC}"
|
||||
NO_COL="${_LP_OPEN_ESC}$(tput me)${_LP_CLOSE_ESC}"
|
||||
|
||||
else
|
||||
# default to Linux
|
||||
BLACK="${_LP_OPEN_ESC}$(tput setaf 0)${_LP_OPEN_ESC}"
|
||||
BOLD_GRAY="${_LP_OPEN_ESC}$(tput bold ; tput setaf 0)${_LP_OPEN_ESC}"
|
||||
WHITE="${_LP_OPEN_ESC}$(tput setaf 7)${_LP_OPEN_ESC}"
|
||||
BOLD_WHITE="${_LP_OPEN_ESC}$(tput bold ; tput setaf 7)${_LP_OPEN_ESC}"
|
||||
BOLD="${_LP_OPEN_ESC}$(tput bold)${_LP_CLOSE_ESC}"
|
||||
|
||||
RED="${_LP_OPEN_ESC}$(tput setaf 1)${_LP_OPEN_ESC}"
|
||||
BOLD_RED="${_LP_OPEN_ESC}$(tput bold ; tput setaf 1)${_LP_OPEN_ESC}"
|
||||
WARN_RED="${_LP_OPEN_ESC}$(tput setaf 0 ; tput setab 1)${_LP_OPEN_ESC}"
|
||||
CRIT_RED="${_LP_OPEN_ESC}$(tput bold; tput setaf 7 ; tput setab 1)${_LP_OPEN_ESC}"
|
||||
RED="${_LP_OPEN_ESC}$(tput setaf 1)${_LP_CLOSE_ESC}"
|
||||
BOLD_RED="${_LP_OPEN_ESC}$(tput bold ; tput setaf 1)${_LP_CLOSE_ESC}"
|
||||
WARN_RED="${_LP_OPEN_ESC}$(tput setaf 0 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
CRIT_RED="${_LP_OPEN_ESC}$(tput bold; tput setaf 7 ; tput setab 1)${_LP_CLOSE_ESC}"
|
||||
|
||||
GREEN="${_LP_OPEN_ESC}$(tput setaf 2)${_LP_OPEN_ESC}"
|
||||
BOLD_GREEN="${_LP_OPEN_ESC}$(tput bold ; tput setaf 2)${_LP_OPEN_ESC}"
|
||||
GREEN="${_LP_OPEN_ESC}$(tput setaf 2)${_LP_CLOSE_ESC}"
|
||||
BOLD_GREEN="${_LP_OPEN_ESC}$(tput bold ; tput setaf 2)${_LP_CLOSE_ESC}"
|
||||
|
||||
YELLOW="${_LP_OPEN_ESC}$(tput setaf 3)${_LP_OPEN_ESC}"
|
||||
BOLD_YELLOW="${_LP_OPEN_ESC}$(tput bold ; tput setaf 3)${_LP_OPEN_ESC}"
|
||||
YELLOW="${_LP_OPEN_ESC}$(tput setaf 3)${_LP_CLOSE_ESC}"
|
||||
BOLD_YELLOW="${_LP_OPEN_ESC}$(tput bold ; tput setaf 3)${_LP_CLOSE_ESC}"
|
||||
|
||||
BLUE="${_LP_OPEN_ESC}$(tput setaf 4)${_LP_OPEN_ESC}"
|
||||
BOLD_BLUE="${_LP_OPEN_ESC}$(tput bold ; tput setaf 4)${_LP_OPEN_ESC}"
|
||||
BLUE="${_LP_OPEN_ESC}$(tput setaf 4)${_LP_CLOSE_ESC}"
|
||||
BOLD_BLUE="${_LP_OPEN_ESC}$(tput bold ; tput setaf 4)${_LP_CLOSE_ESC}"
|
||||
|
||||
PURPLE="${_LP_OPEN_ESC}$(tput setaf 5)${_LP_OPEN_ESC}"
|
||||
PINK="${_LP_OPEN_ESC}$(tput bold ; tput setaf 5)${_LP_OPEN_ESC}"
|
||||
PURPLE="${_LP_OPEN_ESC}$(tput setaf 5)${_LP_CLOSE_ESC}"
|
||||
PINK="${_LP_OPEN_ESC}$(tput bold ; tput setaf 5)${_LP_CLOSE_ESC}"
|
||||
|
||||
CYAN="${_LP_OPEN_ESC}$(tput setaf 6)${_LP_OPEN_ESC}"
|
||||
BOLD_CYAN="${_LP_OPEN_ESC}$(tput bold ; tput setaf 6)${_LP_OPEN_ESC}"
|
||||
CYAN="${_LP_OPEN_ESC}$(tput setaf 6)${_LP_CLOSE_ESC}"
|
||||
BOLD_CYAN="${_LP_OPEN_ESC}$(tput bold ; tput setaf 6)${_LP_CLOSE_ESC}"
|
||||
|
||||
NO_COL="${_LP_OPEN_ESC}$(tput sgr0)${_LP_OPEN_ESC}"
|
||||
NO_COL="${_LP_OPEN_ESC}$(tput sgr0)${_LP_CLOSE_ESC}"
|
||||
|
||||
fi
|
||||
|
||||
# Foreground colors
|
||||
# can be set to white or black
|
||||
FG=$WHITE
|
||||
BOLD_FG=$BOLD_WHITE
|
||||
if [[ $LP_REVERSE == 1 ]] ; then
|
||||
FG=$BLACK
|
||||
BOLD_FG=$BOLD_GRAY
|
||||
fi
|
||||
|
||||
|
||||
# get cpu number
|
||||
_lp_cpunum_Linux()
|
||||
{
|
||||
grep -c '^[Pp]rocessor' /proc/cpuinfo
|
||||
nproc
|
||||
}
|
||||
|
||||
_lp_cpunum_FreeBSD()
|
||||
@ -264,7 +248,7 @@ _lp_user()
|
||||
if [[ "$EUID" -ne "0" ]] ; then
|
||||
# if user is not login user
|
||||
if [[ ${USER} != "$(logname 2>/dev/null)" ]]; then
|
||||
user="${FG}${_LP_USER_SYMBOL}${NO_COL}"
|
||||
user="${_LP_USER_SYMBOL}${NO_COL}"
|
||||
else
|
||||
user="${_LP_USER_SYMBOL}"
|
||||
fi
|
||||
@ -801,7 +785,7 @@ _lp_load_color()
|
||||
local ret
|
||||
ret="${LP_LOAD_MARK}${NO_COL}"
|
||||
if [[ $load -lt 70 ]] ; then
|
||||
ret="${ret}${FG}"
|
||||
ret="${ret}"
|
||||
elif [[ $load -ge 1 ]] && [[ $load -lt 80 ]] ; then
|
||||
ret="${ret}${BOLD_GREEN}"
|
||||
elif [[ $load -ge 80 ]] && [[ $load -lt 95 ]] ; then
|
||||
@ -832,7 +816,7 @@ _lp_load_color()
|
||||
_lp_smart_mark()
|
||||
{
|
||||
local COL
|
||||
COL=${BOLD_FG}
|
||||
COL=${BOLD}
|
||||
if [[ "$EUID" -eq "0" ]] ; then
|
||||
COL=${BOLD_RED}
|
||||
fi
|
||||
@ -919,7 +903,7 @@ _lp_set_bash_prompt()
|
||||
if [[ "$EUID" -ne "0" ]]
|
||||
then
|
||||
# path in foreground color
|
||||
PS1="${PS1}${BOLD_FG}${LP_PWD}${NO_COL}]${LP_PROXY}"
|
||||
PS1="${PS1}${BOLD}${LP_PWD}${NO_COL}]${LP_PROXY}"
|
||||
# add VCS infos
|
||||
PS1="${PS1}${LP_GIT}${LP_HG}${LP_SVN}"
|
||||
else
|
||||
|
||||
@ -19,11 +19,6 @@ LP_PATH_LENGTH=35
|
||||
# Recommended value is 2
|
||||
LP_PATH_KEEP=2
|
||||
|
||||
# Do we use reverse colors (black on white) instead of normal theme (white on black)
|
||||
# Defaults to 0 (normal colors)
|
||||
# set to 1 if you use black on white
|
||||
LP_REVERSE=0
|
||||
|
||||
# Do you want to display the hostname, even if not connected through network?
|
||||
# Defaults to 0 (do not display hostname when localy connected)
|
||||
# set to 1 if you want to always see the hostname
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user