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

Merge pull request #792 from VP468/vp468 

Changes to sudo check for powerline themes - fixes #744
pull/793/head
Nils Winkler 2016-09-26 14:55:19 +08:00 committed by GitHub
parent ad4a72c477 28e9e04d4f
commit 5abbba98bd
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,12 +63,10 @@ function __powerline_user_info_prompt {
local user_info="" local user_info=""
local color=${USER_INFO_THEME_PROMPT_COLOR} local color=${USER_INFO_THEME_PROMPT_COLOR}
if sudo -n uptime 2>&1 | grep -q "load"; then
color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
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 sudo -n uptime 2>&1 | grep -q "load"; then
color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
user_info="!" user_info="!"
fi fi
;; ;;

4
themes/powerline/powerline.theme.bash
View File

@ -42,9 +42,13 @@ function set_rgb_color {
function powerline_shell_prompt { function powerline_shell_prompt {
SHELL_PROMPT_COLOR=${SHELL_THEME_PROMPT_COLOR} SHELL_PROMPT_COLOR=${SHELL_THEME_PROMPT_COLOR}
case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
"sudo")
if sudo -n uptime 2>&1 | grep -q "load"; then if sudo -n uptime 2>&1 | grep -q "load"; then
SHELL_PROMPT_COLOR=${SHELL_THEME_PROMPT_COLOR_SUDO} SHELL_PROMPT_COLOR=${SHELL_THEME_PROMPT_COLOR_SUDO}
fi fi
;;
esac
if [[ -n "${SSH_CLIENT}" ]]; then if [[ -n "${SSH_CLIENT}" ]]; then
SHELL_PROMPT="${SHELL_SSH_CHAR}\u@\h" SHELL_PROMPT="${SHELL_SSH_CHAR}\u@\h"
else else