From 3b120c1dc4398c11ccd20f349720832e698f88ab Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Thu, 2 May 2024 09:28:59 +0900 Subject: [PATCH 1/3] style(themes/wanelo): adjust styles * style(themes/wanelo): fix indentation * style(themes/wanelo): use arithmetic command * style(themes/wanelo): use "function func { ... }" --- themes/wanelo/wanelo.theme.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/themes/wanelo/wanelo.theme.sh b/themes/wanelo/wanelo.theme.sh index b514034..1aa6e54 100644 --- a/themes/wanelo/wanelo.theme.sh +++ b/themes/wanelo/wanelo.theme.sh @@ -12,13 +12,13 @@ GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|" RVM_THEME_PROMPT_PREFIX="|" RVM_THEME_PROMPT_SUFFIX="|" -function _omb_theme_PROMPT_COMMAND() { - if [ $? -eq 0 ]; then - status=❤️ - else - status=💔 - fi - PS1="\n${_omb_prompt_olive}$(_omb_prompt_print_ruby_env) ${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w $status \n${_omb_prompt_bold_teal} ${_omb_prompt_navy}|$(clock_prompt)|${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} " +function _omb_theme_PROMPT_COMMAND { + if (($? == 0)); then + status=❤️ + else + status=💔 + fi + PS1="\n${_omb_prompt_olive}$(_omb_prompt_print_ruby_env) ${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w $status \n${_omb_prompt_bold_teal} ${_omb_prompt_navy}|$(clock_prompt)|${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} " } THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_navy"} From 2b87e07c42c3ef19e71b56080bd7a743eba81180 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Thu, 2 May 2024 09:30:41 +0900 Subject: [PATCH 2/3] fix(themes/wanelo): localize variable "status" --- themes/wanelo/wanelo.theme.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/wanelo/wanelo.theme.sh b/themes/wanelo/wanelo.theme.sh index 1aa6e54..c7a6bf5 100644 --- a/themes/wanelo/wanelo.theme.sh +++ b/themes/wanelo/wanelo.theme.sh @@ -14,9 +14,9 @@ RVM_THEME_PROMPT_SUFFIX="|" function _omb_theme_PROMPT_COMMAND { if (($? == 0)); then - status=❤️ + local status=❤️ else - status=💔 + local status=💔 fi PS1="\n${_omb_prompt_olive}$(_omb_prompt_print_ruby_env) ${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w $status \n${_omb_prompt_bold_teal} ${_omb_prompt_navy}|$(clock_prompt)|${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} " } From f296619ac7d4d3eba2737a4d6a9f0d3769515e4b Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Thu, 2 May 2024 09:36:19 +0900 Subject: [PATCH 3/3] refactor(themes/wanelo): split line to construct PS1 --- themes/wanelo/wanelo.theme.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/themes/wanelo/wanelo.theme.sh b/themes/wanelo/wanelo.theme.sh index c7a6bf5..b42ffe4 100644 --- a/themes/wanelo/wanelo.theme.sh +++ b/themes/wanelo/wanelo.theme.sh @@ -18,7 +18,11 @@ function _omb_theme_PROMPT_COMMAND { else local status=💔 fi - PS1="\n${_omb_prompt_olive}$(_omb_prompt_print_ruby_env) ${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w $status \n${_omb_prompt_bold_teal} ${_omb_prompt_navy}|$(clock_prompt)|${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} " + PS1="\n${_omb_prompt_olive}$(_omb_prompt_print_ruby_env) " + PS1+="${_omb_prompt_purple}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w $status \n" + PS1+="${_omb_prompt_bold_teal} ${_omb_prompt_navy}|$(clock_prompt)|" + PS1+="${_omb_prompt_green}$(scm_prompt_info) " + PS1+="${_omb_prompt_green}→${_omb_prompt_reset_color} " } THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$_omb_prompt_navy"}