XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some regressions and variables names

pull/605/head
Eduardo Bellido Bellido 2016-01-30 12:18:07 +01:00
parent ead5047fb9
commit f6436a878e
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
themes/powerline-multiline/powerline-multiline.theme.bash
View File

@ -62,11 +62,11 @@ function __powerline_user_info_prompt {
local color=${USER_INFO_THEME_PROMPT_COLOR} local color=${USER_INFO_THEME_PROMPT_COLOR}
if sudo -n uptime 2>&1 | grep -q "load"; then if sudo -n uptime 2>&1 | grep -q "load"; then
COLOR=${USER_INFO_THEME_PROMPT_COLOR_SUDO} color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
fi fi
case "${POWERLINE_PROMPT_USER_INFO_MODE}" in case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
"sudo") "sudo")
if [[ "${COLOR}" == "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then if [[ "${color}" == "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
user_info="!" user_info="!"
fi fi
;; ;;
@ -78,15 +78,15 @@ function __powerline_user_info_prompt {
fi fi
;; ;;
esac esac
[[ -n "${user_info}" ]] && echo "${user_info}|${COLOR}" [[ -n "${user_info}" ]] && echo "${user_info}|${color}"
} }
function __powerline_rvm_prompt { function __powerline_rvm_prompt {
local RVM="" local rvm=""
if command_exists rvm; then if command_exists rvm; then
RVM="$(rvm_version_prompt)" rvm="$(rvm_version_prompt)"
[[ -n "${RVM}" ]] && echo "${RVM}|${RVM_THEME_PROMPT_COLOR}" [[ -n "${rvm}" ]] && echo "${RVM_CHAR}${rvm}|${RVM_THEME_PROMPT_COLOR}"
fi fi
} }
@ -95,34 +95,34 @@ function __powerline_python_venv_prompt {
if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
python_venv="${CONDA_DEFAULT_ENV}" python_venv="${CONDA_DEFAULT_ENV}"
PYTHONV_VENV_CHAR=${CONDA_PYTHONVENV_CHAR} PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR}
elif [[ -n "${VIRTUAL_ENV}" ]]; then elif [[ -n "${VIRTUAL_ENV}" ]]; then
python_venv=$(basename "${VIRTUAL_ENV}") python_venv=$(basename "${VIRTUAL_ENV}")
fi fi
[[ -n "${PYTHON_VENV}" ]] && echo "${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}" [[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}"
} }
function __powerline_scm_prompt { function __powerline_scm_prompt {
local color="" local color=""
local SCM_PROMPT="" local scm_prompt=""
scm_prompt_vars scm_prompt_vars
if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then
if [[ "${SCM_DIRTY}" -eq 3 ]]; then if [[ "${SCM_DIRTY}" -eq 3 ]]; then
COLOR=${SCM_THEME_PROMPT_STAGED_COLOR} color=${SCM_THEME_PROMPT_STAGED_COLOR}
elif [[ "${SCM_DIRTY}" -eq 2 ]]; then elif [[ "${SCM_DIRTY}" -eq 2 ]]; then
COLOR=${SCM_THEME_PROMPT_UNSTAGED_COLOR} color=${SCM_THEME_PROMPT_UNSTAGED_COLOR}
elif [[ "${SCM_DIRTY}" -eq 1 ]]; then elif [[ "${SCM_DIRTY}" -eq 1 ]]; then
COLOR=${SCM_THEME_PROMPT_DIRTY_COLOR} color=${SCM_THEME_PROMPT_DIRTY_COLOR}
else else
COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR} color=${SCM_THEME_PROMPT_CLEAN_COLOR}
fi fi
if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
SCM_PROMPT+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}" scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
fi fi
echo "${SCM_PROMPT}|${COLOR}" echo "${scm_prompt}|${color}"
fi fi
} }