Merge pull request #805 from MunifTanjim/modify_clock_prompt

modify clock prompt for better customizability
pull/806/head
Nils Winkler 2016-10-18 07:59:11 +02:00 committed by GitHub
commit f76b3f799b
2 changed files with 14 additions and 6 deletions

View File

@ -16,8 +16,12 @@ SCM_THEME_BRANCH_GONE_PREFIX=' ⇢ '
SCM_THEME_CURRENT_USER_PREFFIX=' ☺︎ ' SCM_THEME_CURRENT_USER_PREFFIX=' ☺︎ '
SCM_THEME_CURRENT_USER_SUFFIX='' SCM_THEME_CURRENT_USER_SUFFIX=''
CLOCK_CHAR='☆' CLOCK_CHAR='⌚'
THEME_CLOCK_CHECK=${THEME_CLOCK_CHECK:=true} THEME_CLOCK_CHAR_COLOR=${THEME_CLOCK_CHAR_COLOR:="${red}"}
[ -z $THEME_SHOW_CLOCK ] && THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-true}
THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%Y-%m-%d %H:%M:%S"}
THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:="${bold_cyan}"}
THEME_BATTERY_PERCENTAGE_CHECK=${THEME_BATTERY_PERCENTAGE_CHECK:=true} THEME_BATTERY_PERCENTAGE_CHECK=${THEME_BATTERY_PERCENTAGE_CHECK:=true}
SCM_GIT_SHOW_DETAILS=${SCM_GIT_SHOW_DETAILS:=true} SCM_GIT_SHOW_DETAILS=${SCM_GIT_SHOW_DETAILS:=true}
@ -371,9 +375,13 @@ function prompt_char {
} }
function clock_char { function clock_char {
if [[ "${THEME_CLOCK_CHECK}" = true ]]; then echo -e "${THEME_CLOCK_CHAR_COLOR}$CLOCK_CHAR"
DATE_STRING=$(date +"%Y-%m-%d %H:%M:%S") }
echo -e "${bold_cyan}$DATE_STRING ${red}$CLOCK_CHAR"
function clock_prompt {
if [[ "${THEME_SHOW_CLOCK}" = true ]]; then
DATE_STRING=$(date +"${THEME_CLOCK_FORMAT}")
echo -e "${THEME_CLOCK_COLOR}$DATE_STRING"
fi fi
} }

View File

@ -14,7 +14,7 @@ RVM_THEME_PROMPT_SUFFIX="|"
function prompt_command() { function prompt_command() {
#PS1="${bold_cyan}$(scm_char)${green}$(scm_prompt_info)${purple}$(ruby_version_prompt) ${yellow}\h ${reset_color}in ${green}\w ${reset_color}\n${green}→${reset_color} " #PS1="${bold_cyan}$(scm_char)${green}$(scm_prompt_info)${purple}$(ruby_version_prompt) ${yellow}\h ${reset_color}in ${green}\w ${reset_color}\n${green}→${reset_color} "
PS1="\n$(battery_char) $(clock_char) ${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}${reset_color} " PS1="\n$(battery_char) $(clock_prompt) $(clock_char) ${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}${reset_color} "
} }
safe_append_prompt_command prompt_command safe_append_prompt_command prompt_command