themes/modern+: Localize variables

This commit is contained in:
Koichi Murase
2024-04-01 22:50:22 +09:00
parent a78672d792
commit 50f629ccda
5 changed files with 23 additions and 22 deletions

View File

@ -70,7 +70,7 @@ function is_vim_shell {
}
function modern_scm_prompt {
CHAR=$(scm_char)
local CHAR=$(scm_char)
if [[ $CHAR == "$SCM_NONE_CHAR" ]]; then
return
else
@ -81,7 +81,7 @@ function modern_scm_prompt {
# show chroot if exist
function chroot {
if [[ $debian_chroot ]]; then
my_ps_chroot=$_omb_prompt_bold_teal$debian_chroot$_omb_prompt_normal
local my_ps_chroot=$_omb_prompt_bold_teal$debian_chroot$_omb_prompt_normal
echo "($my_ps_chroot)"
fi
}
@ -89,22 +89,22 @@ function chroot {
# show virtualenvwrapper
function my_ve {
if [[ $VIRTUAL_ENV ]]; then
my_ps_ve=$_omb_prompt_bold_purple$ve$_omb_prompt_normal
local my_ps_ve=$_omb_prompt_bold_purple$ve$_omb_prompt_normal
echo "($my_ps_ve)"
fi
echo ""
}
function _omb_theme_PROMPT_COMMAND {
my_ps_host="$BOLD$ORANGE\h${_omb_prompt_normal}"
local my_ps_host="$BOLD$ORANGE\h${_omb_prompt_normal}"
# yes, these are the the same for now ...
my_ps_host_root="$ORANGE\h${_omb_prompt_normal}"
local my_ps_host_root="$ORANGE\h${_omb_prompt_normal}"
my_ps_user="$BOLD$GREEN\u${_omb_prompt_normal}"
my_ps_root="${_omb_prompt_bold_brown}\u${_omb_prompt_normal}"
local my_ps_user="$BOLD$GREEN\u${_omb_prompt_normal}"
local my_ps_root="${_omb_prompt_bold_brown}\u${_omb_prompt_normal}"
if [[ $VIRTUAL_ENV ]]; then
ve=$(basename "$VIRTUAL_ENV")
local ve=$(basename "$VIRTUAL_ENV")
fi
# nice prompt

View File

@ -26,7 +26,7 @@ function is_vim_shell {
}
function modern_scm_prompt {
CHAR=$(scm_char)
local CHAR=$(scm_char)
if [[ $CHAR == "$SCM_NONE_CHAR" ]]; then
return
else

View File

@ -26,7 +26,7 @@ function is_vim_shell {
}
function modern_scm_prompt {
CHAR=$(scm_char)
local CHAR=$(scm_char)
if [[ $CHAR == "$SCM_NONE_CHAR" ]]; then
return
else

View File

@ -43,7 +43,7 @@ function is_vim_shell {
}
function modern_scm_prompt {
CHAR=$(scm_char)
local CHAR=$(scm_char)
if [[ $CHAR == "$SCM_NONE_CHAR" ]]; then
return
else
@ -52,6 +52,7 @@ function modern_scm_prompt {
}
function _omb_theme_PROMPT_COMMAND {
local my_ps_host
case $HOSTNAME in
"clappy"* ) my_ps_host="${_omb_prompt_green}\h${_omb_prompt_normal}";
;;
@ -61,9 +62,9 @@ function _omb_theme_PROMPT_COMMAND {
;;
esac
my_ps_user="\[\033[01;32m\]\u\[\033[00m\]";
my_ps_root="\[\033[01;31m\]\u\[\033[00m\]";
my_ps_path="\[\033[01;36m\]\w\[\033[00m\]";
local my_ps_user="\[\033[01;32m\]\u\[\033[00m\]";
local my_ps_root="\[\033[01;31m\]\u\[\033[00m\]";
local my_ps_path="\[\033[01;36m\]\w\[\033[00m\]";
# nice prompt
case $(id -u) in

View File

@ -37,7 +37,7 @@ function is_vim_shell {
}
function modern_scm_prompt {
CHAR=$(scm_char)
local CHAR=$(scm_char)
if [[ $CHAR == "$SCM_NONE_CHAR" ]]; then
return
else
@ -48,7 +48,7 @@ function modern_scm_prompt {
# show chroot if exist
function chroot {
if [[ $debian_chroot ]]; then
my_ps_chroot=$_omb_prompt_bold_teal$debian_chroot$_omb_prompt_normal
local my_ps_chroot=$_omb_prompt_bold_teal$debian_chroot$_omb_prompt_normal
echo "($my_ps_chroot)"
fi
}
@ -56,22 +56,22 @@ function chroot {
# show virtualenvwrapper
function my_ve {
if [[ $VIRTUAL_ENV ]]; then
my_ps_ve=$_omb_prompt_bold_purple$ve$_omb_prompt_normal
local my_ps_ve=$_omb_prompt_bold_purple$ve$_omb_prompt_normal
echo "($my_ps_ve)"
fi
echo ""
}
function _omb_theme_PROMPT_COMMAND {
my_ps_host="${_omb_prompt_green}\h${_omb_prompt_normal}"
local my_ps_host="${_omb_prompt_green}\h${_omb_prompt_normal}"
# yes, these are the the same for now ...
my_ps_host_root="${_omb_prompt_green}\h${_omb_prompt_normal}"
local my_ps_host_root="${_omb_prompt_green}\h${_omb_prompt_normal}"
my_ps_user="${_omb_prompt_bold_green}\u${_omb_prompt_normal}"
my_ps_root="${_omb_prompt_bold_brown}\u${_omb_prompt_normal}"
local my_ps_user="${_omb_prompt_bold_green}\u${_omb_prompt_normal}"
local my_ps_root="${_omb_prompt_bold_brown}\u${_omb_prompt_normal}"
if [[ $VIRTUAL_ENV ]]; then
ve=$(basename "$VIRTUAL_ENV")
local ve=$(basename "$VIRTUAL_ENV")
fi
# nice prompt