From 7d901b11b6683c5a286e06116ff24c1a4b431840 Mon Sep 17 00:00:00 2001 From: MunifTanjim Date: Mon, 17 Oct 2016 04:08:40 +0600 Subject: [PATCH] seperate clock_char function --- themes/base.theme.bash | 9 +++++++-- themes/bobby/bobby.theme.bash | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/themes/base.theme.bash b/themes/base.theme.bash index bf4ee890..509893e5 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -16,7 +16,8 @@ SCM_THEME_BRANCH_GONE_PREFIX=' ⇢ ' SCM_THEME_CURRENT_USER_PREFFIX=' ☺︎ ' SCM_THEME_CURRENT_USER_SUFFIX='' -CLOCK_CHAR='☆' +CLOCK_CHAR='⌚' +THEME_CLOCK_CHAR_COLOR=${THEME_CLOCK_CHAR_COLOR:="${red}"} 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}"} @@ -373,10 +374,14 @@ function prompt_char { scm_char } +function clock_char { + echo -e "${THEME_CLOCK_CHAR_COLOR}$CLOCK_CHAR" +} + function clock_prompt { if [[ "${THEME_SHOW_CLOCK}" = true ]]; then DATE_STRING=$(date +"${THEME_CLOCK_FORMAT}") - echo -e "${THEME_CLOCK_COLOR}$DATE_STRING ${red}$CLOCK_CHAR" + echo -e "${THEME_CLOCK_COLOR}$DATE_STRING" fi } diff --git a/themes/bobby/bobby.theme.bash b/themes/bobby/bobby.theme.bash index 6d3873c5..3ec7cbda 100644 --- a/themes/bobby/bobby.theme.bash +++ b/themes/bobby/bobby.theme.bash @@ -14,7 +14,7 @@ RVM_THEME_PROMPT_SUFFIX="|" 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="\n$(battery_char) $(clock_prompt) ${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