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

Merge pull request #367 from benbrunton/master 

Ensure that battery_charge function is safe to use in themes
pull/368/head
Nils Winkler 2014-11-13 10:39:48 +01:00
parent 83a884431c 1c83611faa
commit e60a9f73c7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
themes/base.theme.bash
View File

@ -216,3 +216,12 @@ function scm_char {
function prompt_char {
scm_char
}
if [ ! -e $BASH_IT/plugins/enabled/battery.plugin.bash ]; then
# if user has installed battery plugin, skip this...
function battery_charge (){
# no op
echo -n
}
fi

9
themes/brunton/brunton.theme.bash
View File

@ -24,15 +24,8 @@ scm_prompt() {
fi
}
safe_battery_charge() {
if [ -e "${BASH_IT}/plugins/enabled/battery.plugin.bash" ];
then
battery_charge
fi
}
prompt() {
PS1="${white}${background_blue} \u${normal}${background_blue}@${red}${background_blue}\h ${blue}${background_white} \t ${reset_color}${normal} $(safe_battery_charge)
PS1="${white}${background_blue} \u${normal}${background_blue}@${red}${background_blue}\h ${blue}${background_white} \t ${reset_color}${normal} $(battery_charge)
${bold_black}${background_white} \w ${normal}$(scm_prompt)$(is_vim_shell)
${white}>${normal} "