shell-user/oh-my-bash
1
0
Fork 0
mirror of https://github.com/ohmybash/oh-my-bash.git synced 2024-05-11 05:55:37 +00:00
Code Issues Projects Releases Wiki Activity

lib, themes: Resolve conflicting variables

Browse Source 
"lib" has used the variables "red", "green", "yellow", "blue", and
"purple" for outputting logs to stdout/stderr.  On the other hand,
"themes" has used the same variables for including escape sequences in
PS1.  These two sets of variables have different values, i.e., the
latter is enclosed by '\[' and '\]' and contains escaped '\e', which
means that there have been variable conflicts.  In this commit, more
specific variables are used in these places to resolve the conflicts.
This commit is contained in:
Koichi Murase
2022-01-19 17:23:35 +09:00
parent 7ed389eafd
commit 8eb9fec5ed
49 changed files with 205 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
themes/iterate/iterate.theme.sh
View File

@@ -3,12 +3,12 @@ SCM_GIT_CHAR="± "
SCM_HG_CHAR="☿ "
SCM_SVN_CHAR="⑆ "
SCM_NONE_CHAR=""
SCM_THEME_PROMPT_DIRTY=" ${red}✗"
SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
SCM_THEME_PROMPT_PREFIX="|"
SCM_THEME_PROMPT_SUFFIX="${green}| "
SCM_GIT_AHEAD_CHAR="${green}+"
SCM_GIT_BEHIND_CHAR="${red}-"
SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}| "
SCM_GIT_AHEAD_CHAR="${_omb_prompt_green}+"
SCM_GIT_BEHIND_CHAR="${_omb_prompt_red}-"
GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_bold_red}✗"
GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
@@ -34,7 +34,7 @@ function git_prompt_info {
LAST_PROMPT=""
function _omb_theme_PROMPT_COMMAND() {
local new_PS1="${_omb_prompt_bold_cyan}$(scm_char)${yellow}$(_omb_prompt_print_ruby_env)${green}\w $(scm_prompt_info)"
local new_PS1="${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_yellow}$(_omb_prompt_print_ruby_env)${_omb_prompt_green}\w $(scm_prompt_info)"
local new_prompt=$(PS1="$new_PS1" "$BASH" --norc -i </dev/null 2>&1 | sed -n '${s/^\(.*\)exit$/\1/p;}')
if [ "$LAST_PROMPT" = "$new_prompt" ]; then
@@ -45,7 +45,7 @@ function _omb_theme_PROMPT_COMMAND() {
local wrap_char=""
[[ ${#new_PS1} -gt $(($COLUMNS/1)) ]] && wrap_char="\n"
PS1="${new_PS1}${green}${wrap_char}→${_omb_prompt_reset_color} "
PS1="${new_PS1}${_omb_prompt_green}${wrap_char}→${_omb_prompt_reset_color} "
}
_omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND