mirror of
https://github.com/ohmybash/oh-my-bash.git
synced 2024-05-11 05:55:37 +00:00
Koichi Murase
8eb9fec5ed
"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.
20 lines
1.1 KiB
Bash
20 lines
1.1 KiB
Bash
#! bash oh-my-bash.module
|
|
SCM_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
|
|
SCM_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
|
|
SCM_THEME_PROMPT_PREFIX=" |"
|
|
SCM_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
|
|
|
|
GIT_THEME_PROMPT_DIRTY=" ${_omb_prompt_red}✗"
|
|
GIT_THEME_PROMPT_CLEAN=" ${_omb_prompt_bold_green}✓"
|
|
GIT_THEME_PROMPT_PREFIX=" ${_omb_prompt_green}|"
|
|
GIT_THEME_PROMPT_SUFFIX="${_omb_prompt_green}|"
|
|
|
|
CONDAENV_THEME_PROMPT_SUFFIX="|"
|
|
|
|
function _omb_theme_PROMPT_COMMAND() {
|
|
#PS1="${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info)${_omb_prompt_magenta}$(_omb_prompt_print_ruby_env) ${_omb_prompt_yellow}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w ${_omb_prompt_reset_color}\n${_omb_prompt_green}→${_omb_prompt_reset_color} "
|
|
PS1="\n${_omb_prompt_yellow}$(python_version_prompt) ${_omb_prompt_magenta}\h ${_omb_prompt_reset_color}in ${_omb_prompt_green}\w\n${_omb_prompt_bold_cyan}$(scm_char)${_omb_prompt_green}$(scm_prompt_info) ${_omb_prompt_green}→${_omb_prompt_reset_color} "
|
|
}
|
|
|
|
_omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND
|