- fixed bug : resetting foreground color when distro logo is enabled

- neater check for cached sudo
- started adding support for custom cwd separator glyph and color
pull/891/head
Tim Noise 2017-01-30 04:33:04 +11:00
parent 58e1e19c9a
commit 3ef6c0b66b
2 changed files with 12 additions and 3 deletions

View File

@ -15,7 +15,7 @@ function __powerline_user_info_prompt {
case "${POWERLINE_PROMPT_USER_INFO_MODE}" in case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
"sudo") "sudo")
if sudo -n uptime 2>&1 | grep -q "load"; then if sudo -n true >/dev/null 2>&1; then
color=${USER_INFO_THEME_PROMPT_COLOR_SUDO} color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
user_info=${USER_INFO_SUDO_CHAR}${USER} user_info=${USER_INFO_SUDO_CHAR}${USER}
fi fi
@ -80,7 +80,13 @@ function __powerline_scm_prompt {
} }
function __powerline_cwd_prompt { function __powerline_cwd_prompt {
echo "$(pwd | sed "s|^${HOME}|~|")|${CWD_THEME_PROMPT_COLOR}" local cwd=$(pwd | sed "s|^${HOME}|~|")
if [[ -n "${CWD_THEME_DIR_SEPARATOR}" ]]; then
# todo
fi
echo "${cwd}|${CWD_THEME_PROMPT_COLOR}"
} }
function __powerline_hostname_prompt { function __powerline_hostname_prompt {
@ -145,7 +151,7 @@ function __powerline_prompt_command {
if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO}" ]]; then if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO}" ]]; then
LEFT_PROMPT+="$(set_color ${PROMPT_DISTRO_LOGO_COLOR} ${PROMPT_DISTRO_LOGO_COLORBG})${PROMPT_DISTRO_LOGO}" LEFT_PROMPT+="$(set_color ${PROMPT_DISTRO_LOGO_COLOR} ${PROMPT_DISTRO_LOGO_COLORBG})${PROMPT_DISTRO_LOGO}$(set_color - -)"
fi fi
## left prompt ## ## left prompt ##

View File

@ -35,6 +35,9 @@ RBENV_THEME_PROMPT_SUFFIX=""
RUBY_THEME_PROMPT_COLOR=161 RUBY_THEME_PROMPT_COLOR=161
RUBY_CHAR=${POWERLINE_RUBY_CHAR:=" "} RUBY_CHAR=${POWERLINE_RUBY_CHAR:=" "}
CWD_THEME_DIR_SEPARATOR=""
CWD_THEME_DIR_SEPARATOR_COLOR=52
CWD_THEME_PROMPT_COLOR=238 CWD_THEME_PROMPT_COLOR=238
HOST_THEME_PROMPT_COLOR=88 HOST_THEME_PROMPT_COLOR=88