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

themes/base: Refactor prompt strings for python envs

Browse Source
This commit is contained in:
Koichi Murase
2021-12-27 23:29:41 +09:00
parent 81535a1e49
commit 77e5874e62
2 changed files with 69 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/utils.sh
View File

@@ -72,6 +72,19 @@
################################################################################
_omb_version=10000
function _omb_util_defun_print {
builtin eval -- "function $1 { local $3; $2 \"\$@\" && printf '%s\n' \"\${$3}\"; }"
}
function _omb_util_defun_deprecate {
local warning=
((_omb_version>=$1)) &&
warning='echo "warning: \`$2'\'' is deprecated. Use \`$3'\''." >&2; '
builtin eval -- "function $2 { $warning$3 \"\$@\"; }"
}
#
# Set Colors
#

70
themes/base.theme.sh
View File

@@ -56,8 +56,18 @@ THEME_SHOW_USER_HOST=${THEME_SHOW_USER_HOST:=false}
USER_HOST_THEME_PROMPT_PREFIX=''
USER_HOST_THEME_PROMPT_SUFFIX=''
# deprecate
VIRTUALENV_THEME_PROMPT_PREFIX=' |'
VIRTUALENV_THEME_PROMPT_SUFFIX='|'
CONDAENV_THEME_PROMPT_PREFIX=' |'
CONDAENV_THEME_PROMPT_SUFFIX='|'
PYTHON_THEME_PROMPT_PREFIX=' |'
PYTHON_THEME_PROMPT_SUFFIX='|'
# # new
# OMB_THEME_PROMPT_VIRTUALENV_FORMAT=' |%s|'
# OMB_THEME_PROMPT_CONDAENV_FORMAT=' |%s|'
# OMB_THEME_PROMPT_PYTHON_VERSION_FORMAT=' |%s|'
RBENV_THEME_PROMPT_PREFIX=' |'
RBENV_THEME_PROMPT_SUFFIX='|'
@@ -385,27 +395,59 @@ function ruby_version_prompt {
echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
}
function virtualenv_prompt {
if [[ -n "$VIRTUAL_ENV" ]]; then
virtualenv=`basename "$VIRTUAL_ENV"`
echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$virtualenv$VIRTUALENV_THEME_PROMPT_SUFFIX"
fi
function _omb_prompt_get_virtualenv {
virtualenv=
[[ ${VIRTUAL_ENV-} ]] || return 1
local prefix=${VIRTUALENV_THEME_PROMPT_PREFIX-}
local suffix=${VIRTUALENV_THEME_PROMPT_SUFFIX-}
local format=${OMB_THEME_PROMPT_VIRTUALENV_FORMAT-${prefix//'%'/'%%'}%s${suffix//'%'/'%%'}}
printf -v virtualenv "$format" "$(basename "$VIRTUAL_ENV")"
}
function condaenv_prompt {
if [[ $CONDA_DEFAULT_ENV ]]; then
echo -e "${CONDAENV_THEME_PROMPT_PREFIX}${CONDA_DEFAULT_ENV}${CONDAENV_THEME_PROMPT_SUFFIX}"
fi
function _omb_prompt_get_condaenv {
condaenv=
[[ ${CONDA_DEFAULT_ENV-} ]] || return 1
local prefix=${CONDAENV_THEME_PROMPT_PREFIX-}
local suffix=${CONDAENV_THEME_PROMPT_SUFFIX-}
local format=${OMB_THEME_PROMPT_CONDAENV_FORMAT-${prefix//'%'/'%%'}%s${suffix//'%'/'%%'}}
printf -v condaenv "$format" "$CONDA_DEFAULT_ENV"
}
function py_interp_prompt {
py_version=$(python --version 2>&1 | awk '{print "py-"$2;}') || return
echo -e "${PYTHON_THEME_PROMPT_PREFIX}${py_version}${PYTHON_THEME_PROMPT_SUFFIX}"
function _omb_prompt_get_python_version {
python_version=$(python --version 2>&1 | command awk '{print "py-"$2;}')
[[ $python_version ]] || return 1
local prefix=${PYTHON_THEME_PROMPT_PREFIX-}
local suffix=${PYTHON_THEME_PROMPT_SUFFIX-}
local format=${OMB_THEME_PROMPT_PYTHON_VERSION_FORMAT-${prefix//'%'/'%%'}%s${suffix//'%'/'%%'}}
printf -v python_version "$format" "$python_version"
}
function python_version_prompt {
echo -e "$(virtualenv_prompt)$(condaenv_prompt)$(py_interp_prompt)"
function _omb_prompt_get_python_venv {
local virtualenv condaenv
_omb_prompt_get_virtualenv
_omb_prompt_get_condaenv
python_venv=$virtualenv$condaenv
[[ $python_venv ]]
}
function _omb_prompt_get_python_env {
local virtualenv condaenv python_version
_omb_prompt_get_virtualenv
_omb_prompt_get_condaenv
_omb_prompt_get_python_version
python_env=$virtualenv$condaenv$python_version
[[ $python_env ]]
}
_omb_util_defun_print _omb_prompt_{print,get}_virtualenv virtualenv
_omb_util_defun_print _omb_prompt_{print,get}_condaenv condaenv
_omb_util_defun_print _omb_prompt_{print,get}_python_version python_version
_omb_util_defun_print _omb_prompt_{print,get}_python_venv python_venv
_omb_util_defun_print _omb_prompt_{print,get}_python_env python_env
_omb_util_defun_deprecate 20000 virtualenv_prompt _omb_prompt_print_virtualenv
_omb_util_defun_deprecate 20000 condaenv_prompt _omb_prompt_print_condaenv
_omb_util_defun_deprecate 20000 py_interp_prompt _omb_prompt_print_python_version
_omb_util_defun_deprecate 20000 python_version_prompt _omb_prompt_print_python_env
function git_user_info {
# support two or more initials, set by 'git pair' plugin