Merge pull request #227 from ebautistabar/demula.lastcmdfail

Fixes in demula theme

themes/demula/demula.theme.bash

@@ -82,8 +82,17 @@ ${D_BRANCH_COLOR}%b %r ${D_CHANGES_COLOR}%m%u ${D_DEFAULT_COLOR}"
   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() {
+  local LAST_COMMAND_FAILED=$(mitsuhikos_lastcommandfailed)
   local SAVE_CURSOR='\033[s'
   local RESTORE_CURSOR='\033[u'
   local MOVE_CURSOR_RIGHTMOST='\033[500C'
@@ -93,11 +102,11 @@ prompt() {
   then
     PS1="${TITLEBAR}
 ${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}\
 at ${D_MACHINE_COLOR}\h ${D_INTERMEDIATE_COLOR}\
 in ${D_DIR_COLOR}\w ${D_INTERMEDIATE_COLOR}\
-$(mitsuhikos_lastcommandfailed)\
+${LAST_COMMAND_FAILED}\
 $(demula_vcprompt)\
 $(is_vim_shell)
 ${D_INTERMEDIATE_COLOR}$ ${D_DEFAULT_COLOR}"
@@ -106,10 +115,10 @@ ${D_INTERMEDIATE_COLOR}$ ${D_DEFAULT_COLOR}"
 ${D_USER_COLOR}\u ${D_INTERMEDIATE_COLOR}\
 at ${D_MACHINE_COLOR}\h ${D_INTERMEDIATE_COLOR}\
 in ${D_DIR_COLOR}\w ${D_INTERMEDIATE_COLOR}\
-$(mitsuhikos_lastcommandfailed)\
+${LAST_COMMAND_FAILED}\
 $(demula_vcprompt)\
 $(is_vim_shell)\
-$(battery_charge)
+$(safe_battery_charge)
 ${D_INTERMEDIATE_COLOR}$ ${D_DEFAULT_COLOR}"
   fi