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

Add support for time

Browse Source
This commit is contained in:
Olivier 2012-08-17 15:47:44 +02:00
parent 320adbd37b
commit eec94d1db8
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
liquidprompt
View File

@ -198,6 +198,7 @@ LP_ENABLE_BATT=${LP_ENABLE_BATT:-1}
LP_ENABLE_GIT=${LP_ENABLE_GIT:-1} LP_ENABLE_GIT=${LP_ENABLE_GIT:-1}
LP_ENABLE_SVN=${LP_ENABLE_SVN:-1} LP_ENABLE_SVN=${LP_ENABLE_SVN:-1}
LP_ENABLE_HG=${LP_ENABLE_HG:-1} LP_ENABLE_HG=${LP_ENABLE_HG:-1}
LP_ENABLE_TIME=${LP_ENABLE_TIME:-1}
LP_MARK_BATTERY=${LP_MARK_BATTERY:-"⌁"} LP_MARK_BATTERY=${LP_MARK_BATTERY:-"⌁"}
LP_MARK_ADAPTER=${LP_MARK_ADAPTER:-"⏚"} LP_MARK_ADAPTER=${LP_MARK_ADAPTER:-"⏚"}
@ -233,6 +234,7 @@ LP_COLOR_CHARGING_ABOVE=${LP_COLOR_CHARGING_ABOVE:-$GREEN}
LP_COLOR_CHARGING_UNDER=${LP_COLOR_CHARGING_UNDER:-$YELLOW} LP_COLOR_CHARGING_UNDER=${LP_COLOR_CHARGING_UNDER:-$YELLOW}
LP_COLOR_DISCHARGING_ABOVE=${LP_COLOR_DISCHARGING_ABOVE:-$YELLOW} LP_COLOR_DISCHARGING_ABOVE=${LP_COLOR_DISCHARGING_ABOVE:-$YELLOW}
LP_COLOR_DISCHARGING_UNDER=${LP_COLOR_DISCHARGING_UNDER:-$RED} LP_COLOR_DISCHARGING_UNDER=${LP_COLOR_DISCHARGING_UNDER:-$RED}
LP_COLOR_TIME=${LP_COLOR_TIME:-$RED}
LP_COLORMAP_0=${LP_COLORMAP_0:-""} LP_COLORMAP_0=${LP_COLORMAP_0:-""}
LP_COLORMAP_1=${LP_COLORMAP_1:-$GREEN} LP_COLORMAP_1=${LP_COLORMAP_1:-$GREEN}
@ -760,8 +762,8 @@ _lp_battery_color()
{ {
[[ "$LP_ENABLE_BATT" != 1 ]] && return [[ "$LP_ENABLE_BATT" != 1 ]] && return
local mark=$LP_MARK_BATTERY local mark=$LP_BATTERY_MARK
local chargingmark=$LP_MARK_ADAPTER local chargingmark=$LP_ADAPTER_MARK
local bat local bat
local ret local ret
bat=$(_lp_battery) bat=$(_lp_battery)
@ -930,8 +932,19 @@ _lp_sb()
if [[ ! -z "$1" ]] ; then if [[ ! -z "$1" ]] ; then
echo -n " $1 " echo -n " $1 "
fi fi
} }
###################
# CURRENT TIME #
###################
_lp_time()
{
[[ "$LP_ENABLE_TIME" != 1 ]] && return
echo -ne " (${LP_COLOR_TIME}$(date +%H:%M:%S)${NO_COL}) "
}
######################## ########################
# Construct the prompt # # Construct the prompt #
@ -949,6 +962,7 @@ _lp_set_prompt()
LP_JOBS=$(_lp_sr "$(_lp_jobcount_color)") LP_JOBS=$(_lp_sr "$(_lp_jobcount_color)")
LP_LOAD=$(_lp_sr "$(_lp_load_color)") LP_LOAD=$(_lp_sr "$(_lp_load_color)")
LP_BATT=$(_lp_sr "$(_lp_battery_color)") LP_BATT=$(_lp_sr "$(_lp_battery_color)")
LP_TIME=$(_lp_time)
# in main prompt: no space # in main prompt: no space
LP_USER=$(_lp_user) LP_USER=$(_lp_user)
@ -973,8 +987,8 @@ _lp_set_prompt()
fi fi
if [[ -z $LP_PS1 ]] ; then if [[ -z $LP_PS1 ]] ; then
# add jobs, load and battery # add time, jobs, load and battery
PS1="${LP_BATT}${LP_LOAD}${LP_JOBS}" PS1="${LP_TIME}${LP_BATT}${LP_LOAD}${LP_JOBS}"
# add user, host and permissions colon # add user, host and permissions colon
PS1="${PS1}[${LP_USER}${LP_HOST}${LP_PERM}" PS1="${PS1}[${LP_USER}${LP_HOST}${LP_PERM}"