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/omb-prompt-*: Adjust conflicts and dependencies

Browse Source
This commit is contained in:
Koichi Murase
2022-01-19 16:58:44 +09:00
parent a0db119be6
commit d0e61d2261
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/omb-deprecate.sh
View File

@ -265,16 +265,16 @@ _omb_deprecate_const 20000 underline "$_omb_term_underline" "Please use '_omb_te
_omb_deprecate_const 20000 reset "$_omb_term_reset" "Please use '_omb_term_reset'."
_omb_deprecate_const 20000 tan "$_omb_term_yellow" "Please use '_omb_term_yellow'."
_omb_prompt_red=${_omb_term_red:+$'\1'$_omb_term_red$'\2'}
_omb_prompt_green=${_omb_term_green:+$'\1'$_omb_term_green$'\2'}
_omb_prompt_yellow=${_omb_term_yellow:+$'\1'$_omb_term_yellow$'\2'}
_omb_prompt_blue=${_omb_term_blue:+$'\1'$_omb_term_blue$'\2'}
_omb_prompt_magenta=${_omb_term_magenta:+$'\1'$_omb_term_magenta$'\2'}
_omb_deprecate_const 20000 red "$_omb_prompt_red" "Please use '_omb_term_red' or '_omb_prompt_red'."
_omb_deprecate_const 20000 green "$_omb_prompt_green" "Please use '_omb_term_green' or '_omb_prompt_green'."
_omb_deprecate_const 20000 yellow "$_omb_prompt_yellow" "Please use '_omb_term_yellow' or '_omb_prompt_yellow'."
_omb_deprecate_const 20000 blue "$_omb_prompt_blue" "Please use '_omb_term_blue' or '_omb_prompt_blue'."
_omb_deprecate_const 20000 purple "$_omb_prompt_magenta" "Please use '_omb_term_magenta' or '_omb_prompt_magenta'."
_omb_deprecate_red=${_omb_term_red:+$'\1'$_omb_term_red$'\2'}
_omb_deprecate_green=${_omb_term_green:+$'\1'$_omb_term_green$'\2'}
_omb_deprecate_yellow=${_omb_term_yellow:+$'\1'$_omb_term_yellow$'\2'}
_omb_deprecate_blue=${_omb_term_blue:+$'\1'$_omb_term_blue$'\2'}
_omb_deprecate_magenta=${_omb_term_magenta:+$'\1'$_omb_term_magenta$'\2'}
_omb_deprecate_const 20000 red "$_omb_deprecate_red" "Please use '_omb_term_red' or '_omb_prompt_red'."
_omb_deprecate_const 20000 green "$_omb_deprecate_green" "Please use '_omb_term_green' or '_omb_prompt_green'."
_omb_deprecate_const 20000 yellow "$_omb_deprecate_yellow" "Please use '_omb_term_yellow' or '_omb_prompt_yellow'."
_omb_deprecate_const 20000 blue "$_omb_deprecate_blue" "Please use '_omb_term_blue' or '_omb_prompt_blue'."
_omb_deprecate_const 20000 purple "$_omb_deprecate_magenta" "Please use '_omb_term_magenta' or '_omb_prompt_magenta'."
_omb_deprecate_function 20000 e_header _omb_log_header
_omb_deprecate_function 20000 e_arrow _omb_log_arrow

3
lib/omb-prompt-base.sh
View File

@ -1,5 +1,8 @@
#! bash oh-my-bash.module
_omb_module_require lib:omb-deprecate
_omb_module_require lib:omb-prompt-colors
CLOCK_CHAR_THEME_PROMPT_PREFIX=''
CLOCK_CHAR_THEME_PROMPT_SUFFIX=''
CLOCK_THEME_PROMPT_PREFIX=''

15
lib/omb-prompt-colors.sh
View File

@ -1,4 +1,8 @@
#! bash oh-my-bash.module
#
# 2022-01-20 Koichi Murase: renamed from "themes/colours.theme.sh" to "lib/omb-prompt-colors.sh"
_omb_module_require lib:omb-deprecate
function _omb_theme__construct_sgr {
out=
@ -77,12 +81,11 @@ function _omb_theme_color_echo {
echo "\033[${out}m"
}
# already defined in lib/omb-deprecated.sh
# @var _omb_prompt_red
# @var _omb_prompt_green
# @var _omb_prompt_yellow
# @var _omb_prompt_blue
# @var _omb_prompt_magenta
_omb_prompt_red='\[\e[0;31m\]'
_omb_prompt_green='\[\e[0;32m\]'
_omb_prompt_yellow='\[\e[0;33m\]'
_omb_prompt_blue='\[\e[0;34m\]'
_omb_prompt_magenta='\[\e[0;35m\]'
_omb_prompt_black='\[\e[0;30m\]'
_omb_prompt_cyan='\[\e[0;36m\]'
_omb_prompt_white='\[\e[0;37m\]'

1
oh-my-bash.sh
View File

@ -96,7 +96,6 @@ _omb_module_require_theme() { _omb_module_require "${@/#/theme:}"; }
# Load all of the config files in ~/.oh-my-bash/lib that end in .sh
# TIP: Add files you don't want in git to .gitignore
_omb_module_require_lib utils
_omb_module_require_lib omb-deprecate
_omb_util_glob_expand _omb_init_files '{"$OSH","$OSH_CUSTOM"}/lib/*.{bash,sh}'
_omb_init_files=("${_omb_init_files[@]##*/}")
_omb_init_files=("${_omb_init_files[@]%.bash}")