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

Merge pull request #227 from ebautistabar/demula.lastcmdfail 

Fixes in demula theme
pull/219/merge
Omer Katz 2014-10-28 12:34:45 +02:00
parent a094f417f0 f096b0fcc0
commit 3d36ad7522
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
themes/demula/demula.theme.bash
View File

@ -82,8 +82,17 @@ ${D_BRANCH_COLOR}%b %r ${D_CHANGES_COLOR}%m%u ${D_DEFAULT_COLOR}"
fi fi
} }
# checks if the plugin is installed before calling battery_charge
safe_battery_charge() {
if [ -e "${BASH_IT}/plugins/enabled/battery.plugin.bash" ];
then
battery_charge
fi
}
# -------------------------------------------------------------- PROMPT OUTPUT # -------------------------------------------------------------- PROMPT OUTPUT
prompt() { prompt() {
local LAST_COMMAND_FAILED=$(mitsuhikos_lastcommandfailed)
local SAVE_CURSOR='\033[s' local SAVE_CURSOR='\033[s'
local RESTORE_CURSOR='\033[u' local RESTORE_CURSOR='\033[u'
local MOVE_CURSOR_RIGHTMOST='\033[500C' local MOVE_CURSOR_RIGHTMOST='\033[500C'
@ -93,11 +102,11 @@ prompt() {
then then
PS1="${TITLEBAR} PS1="${TITLEBAR}
${SAVE_CURSOR}${MOVE_CURSOR_RIGHTMOST}${MOVE_CURSOR_5_LEFT}\ ${SAVE_CURSOR}${MOVE_CURSOR_RIGHTMOST}${MOVE_CURSOR_5_LEFT}\
$(battery_charge)${RESTORE_CURSOR}\ $(safe_battery_charge)${RESTORE_CURSOR}\
${D_USER_COLOR}\u ${D_INTERMEDIATE_COLOR}\ ${D_USER_COLOR}\u ${D_INTERMEDIATE_COLOR}\
at ${D_MACHINE_COLOR}\h ${D_INTERMEDIATE_COLOR}\ at ${D_MACHINE_COLOR}\h ${D_INTERMEDIATE_COLOR}\
in ${D_DIR_COLOR}\w ${D_INTERMEDIATE_COLOR}\ in ${D_DIR_COLOR}\w ${D_INTERMEDIATE_COLOR}\
$(mitsuhikos_lastcommandfailed)\ ${LAST_COMMAND_FAILED}\
$(demula_vcprompt)\ $(demula_vcprompt)\
$(is_vim_shell) $(is_vim_shell)
${D_INTERMEDIATE_COLOR}$ ${D_DEFAULT_COLOR}" ${D_INTERMEDIATE_COLOR}$ ${D_DEFAULT_COLOR}"
@ -106,10 +115,10 @@ ${D_INTERMEDIATE_COLOR}$ ${D_DEFAULT_COLOR}"
${D_USER_COLOR}\u ${D_INTERMEDIATE_COLOR}\ ${D_USER_COLOR}\u ${D_INTERMEDIATE_COLOR}\
at ${D_MACHINE_COLOR}\h ${D_INTERMEDIATE_COLOR}\ at ${D_MACHINE_COLOR}\h ${D_INTERMEDIATE_COLOR}\
in ${D_DIR_COLOR}\w ${D_INTERMEDIATE_COLOR}\ in ${D_DIR_COLOR}\w ${D_INTERMEDIATE_COLOR}\
$(mitsuhikos_lastcommandfailed)\ ${LAST_COMMAND_FAILED}\
$(demula_vcprompt)\ $(demula_vcprompt)\
$(is_vim_shell)\ $(is_vim_shell)\
$(battery_charge) $(safe_battery_charge)
${D_INTERMEDIATE_COLOR}$ ${D_DEFAULT_COLOR}" ${D_INTERMEDIATE_COLOR}$ ${D_DEFAULT_COLOR}"
fi fi