Update battery.plugin.bash

- Add WIndows Bash checker.
- Clean and organize the code.

plugins/available/battery.plugin.bash

@@ -10,6 +10,10 @@ ac_adapter_connected(){
   then
     ioreg -n AppleSmartBattery -r | grep -q '"ExternalConnected" = Yes'
     return $?
+  elif command_exists WMIC;
+  then
+    WMIC Path Win32_Battery Get BatteryStatus /Format:List | grep -q 'BatteryStatus=2'
+    return $?
   fi
 }
 
@@ -22,13 +26,17 @@ ac_adapter_disconnected(){
   then
     ioreg -n AppleSmartBattery -r | grep -q '"ExternalConnected" = No'
     return $?
+  elif command_exists WMIC;
+  then
+    WMIC Path Win32_Battery Get BatteryStatus /Format:List | grep -q 'BatteryStatus=1'
+    return $?
   fi
 }
 
 battery_percentage(){
   about 'displays battery charge as a percentage of full (100%)'
   group 'battery'
-
+  
   if command_exists acpi;
   then
     local ACPI_OUTPUT=$(acpi -b)
@@ -38,37 +46,45 @@ battery_percentage(){
         case $PERC_OUTPUT in
           *%)
             echo "0${PERC_OUTPUT}" | head -c 2
-            ;;
+          ;;
           *)
             echo ${PERC_OUTPUT}
-            ;;
+          ;;
         esac
-        ;;
+      ;;
-
+      
       *" Charging"* | *" Discharging"*)
         local PERC_OUTPUT=$(echo $ACPI_OUTPUT | awk -F, '/,/{gsub(/ /, "", $0); gsub(/%/,"", $0); print $2}' )
         echo ${PERC_OUTPUT}
-        ;;
+      ;;
       *" Full"*)
         echo '100'
-        ;;
+      ;;
       *)
         echo '-1'
-        ;;
+      ;;
     esac
   elif command_exists ioreg;
   then
-    # http://hints.macworld.com/article.php?story=20100130123935998
-    #local IOREG_OUTPUT_10_6=$(ioreg -l | grep -i capacity | tr '\n' ' | ' | awk '{printf("%.2f%%", $10/$5 * 100)}')
-    #local IOREG_OUTPUT_10_5=$(ioreg -l | grep -i capacity | grep -v Legacy| tr '\n' ' | ' | awk '{printf("%.2f%%", $14/$7 * 100)}')
     local IOREG_OUTPUT=$(ioreg -n AppleSmartBattery -r | awk '$1~/Capacity/{c[$1]=$3} END{OFMT="%05.2f%%"; max=c["\"MaxCapacity\""]; print (max>0? 100*c["\"CurrentCapacity\""]/max: "?")}')
     case $IOREG_OUTPUT in
       100*)
         echo '100'
-        ;;
+      ;;
       *)
         echo $IOREG_OUTPUT | head -c 2
-        ;;
+      ;;
+    esac
+  elif command_exists WMIC;
+  then
+    local WINPC=$(echo porcent=$(WMIC PATH Win32_Battery Get EstimatedChargeRemaining /Format:List) | grep -o '[0-9]*')
+    case $WINPC in
+      100*)
+        echo '100'
+      ;;
+      *)
+        echo $WINPC
+      ;;
     esac
   else
     echo "no"
@@ -78,7 +94,7 @@ battery_percentage(){
 battery_charge(){
   about 'graphical display of your battery charge'
   group 'battery'
-
+  
   # Full char
   local F_C='▸'
   # Depleted char
@@ -89,55 +105,55 @@ battery_charge(){
   local DANGER_COLOR="${red}"
   local BATTERY_OUTPUT="${DEPLETED_COLOR}${D_C}${D_C}${D_C}${D_C}${D_C}"
   local BATTERY_PERC=$(battery_percentage)
-
+  
   case $BATTERY_PERC in
     no)
       echo ""
-      ;;
+    ;;
     9*)
       echo "${FULL_COLOR}${F_C}${F_C}${F_C}${F_C}${F_C}${normal}"
-      ;;
+    ;;
     8*)
       echo "${FULL_COLOR}${F_C}${F_C}${F_C}${F_C}${HALF_COLOR}${F_C}${normal}"
-      ;;
+    ;;
     7*)
       echo "${FULL_COLOR}${F_C}${F_C}${F_C}${F_C}${DEPLETED_COLOR}${D_C}${normal}"
-      ;;
+    ;;
     6*)
       echo "${FULL_COLOR}${F_C}${F_C}${F_C}${HALF_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${normal}"
-      ;;
+    ;;
     5*)
       echo "${FULL_COLOR}${F_C}${F_C}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     4*)
       echo "${FULL_COLOR}${F_C}${F_C}${HALF_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     3*)
       echo "${FULL_COLOR}${F_C}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     2*)
       echo "${FULL_COLOR}${F_C}${HALF_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     1*)
       echo "${FULL_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     05)
       echo "${DANGER_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     04)
       echo "${DANGER_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     03)
       echo "${DANGER_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     02)
       echo "${DANGER_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     0*)
       echo "${HALF_COLOR}${F_C}${DEPLETED_COLOR}${D_C}${D_C}${D_C}${D_C}${normal}"
-      ;;
+    ;;
     *)
       echo "${DANGER_COLOR}UNPLG${normal}"
-      ;;
+    ;;
   esac
 }