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

i am bad at git

pull/891/head
Tim Noise 2017-12-16 16:53:45 +11:00
parent 0eb02456e2
commit 54d6a10601
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
themes/powerline/powerline.base.bash
View File

@ -96,13 +96,10 @@ function __powerline_cwd_prompt {
function __powerline_hostname_prompt { function __powerline_hostname_prompt {
echo "$(hostname -s)|${HOST_THEME_PROMPT_COLOR}" echo "$(hostname -s)|${HOST_THEME_PROMPT_COLOR}"
<<<<<<< HEAD
=======
} }
function __powerline_wd_prompt { function __powerline_wd_prompt {
echo "\W|${CWD_THEME_PROMPT_COLOR}" echo "\W|${CWD_THEME_PROMPT_COLOR}"
>>>>>>> master
} }
function __powerline_clock_prompt { function __powerline_clock_prompt {
@ -166,22 +163,12 @@ function __powerline_prompt_command {
LEFT_PROMPT+="$(set_color ${PROMPT_DISTRO_LOGO_COLOR} ${PROMPT_DISTRO_LOGO_COLORBG})${PROMPT_DISTRO_LOGO}$(set_color - -)" LEFT_PROMPT+="$(set_color ${PROMPT_DISTRO_LOGO_COLOR} ${PROMPT_DISTRO_LOGO_COLORBG})${PROMPT_DISTRO_LOGO}$(set_color - -)"
fi fi
<<<<<<< HEAD
=======
local OLD_IFS="${IFS}"; IFS=" "
>>>>>>> master
## left prompt ## ## left prompt ##
for segment in $POWERLINE_PROMPT; do for segment in $POWERLINE_PROMPT; do
local info="$(__powerline_${segment}_prompt)" local info="$(__powerline_${segment}_prompt)"
[[ -n "${info}" ]] && __powerline_left_segment "${info}" [[ -n "${info}" ]] && __powerline_left_segment "${info}"
done done
<<<<<<< HEAD
=======
IFS="${OLD_IFS}"
>>>>>>> master
[[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status}) [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
[[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}" [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}"