Merge pull request #2 from Zeuh/master

Fix: test if acpi exists to avoid error message
2012-07-17 00:13:08 -07:00 · 2012-07-17 00:13:08 -07:00 · e653135dd3
commit e653135dd3
parent 24ccf4783c 0aa9f952da
1 changed files with 6 additions and 1 deletions
--- a/prompt.bash
+++ b/prompt.bash
@ -159,7 +159,12 @@ git_branch_color()
 # Get the battery status in percent
 battery()
 {
-    bat=`acpi --battery | sed "s/^Battery .*, \([0-9]*\)%.*$/\1/"`
+    command -v acpi >/dev/null 2>&1 || { echo -n ""; return; }
+    bat=`acpi --battery 2>/dev/null | sed "s/^Battery .*, \([0-9]*\)%.*$/\1/"`
+    if [ "${bat}x" == "x" ] ; then
+	echo -n ""
+	return
+    fi
    if [ ${bat} -lt 90 ] ; then
        echo -n " ${bat}%"
    else