Puts status segment after time

This commit is contained in:
Caio Gondim
2015-01-05 23:50:55 +01:00
parent b2ca161cbb
commit a63c147ecf
2 changed files with 25 additions and 11 deletions

View File

@@ -95,12 +95,15 @@ BULLETTRAIN_PROMPT_CHAR="\$"
BULLETTRAIN_PROMPT_ROOT=true BULLETTRAIN_PROMPT_ROOT=true
``` ```
The status segment backgound, foreground color and visibility: The status segment background. Shows if the last command exited with error, and
if there is jobs on background running:
```bash ```bash
BULLETTRAIN_STATUS_SHOW=true BULLETTRAIN_STATUS_SHOW=true
BULLETTRAIN_STATUS_BG=black BULLETTRAIN_EXIT_SHOW=false
BULLETTRAIN_STATUS_FG=default BULLETTRAIN_STATUS_BG=green
BULLETTRAIN_STATUS_ERROR_BG=red
BULLETTRAIN_STATUS_FG=black
``` ```
The time segment background, foreground color and visibility: The time segment background, foreground color and visibility:

View File

@@ -25,13 +25,19 @@ fi
# STATUS # STATUS
if [ ! -n "${BULLETTRAIN_STATUS_SHOW+1}" ]; then if [ ! -n "${BULLETTRAIN_STATUS_SHOW+1}" ]; then
BULLETTRAIN_STATUS_SHOW=false BULLETTRAIN_STATUS_SHOW=true
fi
if [ ! -n "${BULLETTRAIN_EXIT_SHOW+1}" ]; then
BULLETTRAIN_EXIT_SHOW=false
fi fi
if [ ! -n "${BULLETTRAIN_STATUS_BG+1}" ]; then if [ ! -n "${BULLETTRAIN_STATUS_BG+1}" ]; then
BULLETTRAIN_STATUS_BG=black BULLETTRAIN_STATUS_BG=green
fi
if [ ! -n "${BULLETTRAIN_STATUS_ERROR_BG+1}" ]; then
BULLETTRAIN_STATUS_ERROR_BG=red
fi fi
if [ ! -n "${BULLETTRAIN_STATUS_FG+1}" ]; then if [ ! -n "${BULLETTRAIN_STATUS_FG+1}" ]; then
BULLETTRAIN_STATUS_FG=default BULLETTRAIN_STATUS_FG=black
fi fi
# TIME # TIME
@@ -373,12 +379,17 @@ prompt_status() {
local symbols local symbols
symbols=() symbols=()
[[ $RETVAL -ne 0 && $BULLETTRAIN_EXIT_SHOW != true ]] && symbols+="%{%F{red}%}✘ " [[ $RETVAL -ne 0 && $BULLETTRAIN_EXIT_SHOW != true ]] && symbols+=""
[[ $RETVAL -ne 0 && $BULLETTRAIN_EXIT_SHOW == true ]] && symbols+="%{%F{red}%}✘ $RETVAL" [[ $RETVAL -ne 0 && $BULLETTRAIN_EXIT_SHOW == true ]] && symbols+="✘ $RETVAL"
[[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡" [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
[[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙" [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="⚙"
if [[ -n "$symbols" && $RETVAL -ne 0 ]] then
prompt_segment $BULLETTRAIN_STATUS_ERROR_BG $BULLETTRAIN_STATUS_FG "$symbols"
elif [[ -n "$symbols" ]] then
prompt_segment $BULLETTRAIN_STATUS_BG $BULLETTRAIN_STATUS_FG "$symbols"
fi
[[ -n "$symbols" ]] && prompt_segment $BULLETTRAIN_STATUS_BG $BULLETTRAIN_STATUS_FG "$symbols"
} }
# Prompt Character # Prompt Character
@@ -403,8 +414,8 @@ prompt_char() {
build_prompt() { build_prompt() {
RETVAL=$? RETVAL=$?
prompt_status
prompt_time prompt_time
prompt_status
prompt_rvm prompt_rvm
prompt_virtualenv prompt_virtualenv
prompt_nvm prompt_nvm