Changed acpi to be preferred over upower (#78)

Author: rux616

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ### master
+- Changed preferred order of utility applications to be `pmset` -> `acpi` -> `upower` -> `termux-battery-status` due to CPU usage issues with `upower` (2019-03-05) (@rux616)
 - Added `#{battery_status_bg}` feature (@RyanFrantz) 
 - Added multibattery output support for `upower` (@futuro)
 - Added Chromebook support (@forkjoseph)

README.md

@@ -4,13 +4,13 @@ Enables displaying battery percentage and status icon in tmux status-right.
 
 ## Installation
 
-In order to read the battery status, this plugin depends on having either one of the following applications installed:
-- pmset
-- upower
+In order to read the battery status, this plugin depends on having one of the following applications installed:
+- pmset (MacOS only)
 - acpi
+- upower
 - termux-battery-status
 
-In a normal situation one of these above should be installed on your system by default and thus it would not be necessary to install one of them.
+In a normal situation, one of the above should be installed on your system by default and thus it should not be necessary to specifically install one of them. That being said, the `acpi` utility is currently recommended for use over `upower` where possible due to ongoing CPU usage issues.
 
 ### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
 
@@ -133,6 +133,7 @@ twitter if you want to hear about new tmux plugins or feature updates.
  - Aleksandar Djurdjic
  - Bruno Sutic
  - Caleb
+ - Dan Cassidy
  - Diego Ximenes
  - Evan N-D
  - Jan Ahrens

scripts/battery_percentage.sh

@@ -8,6 +8,8 @@ print_battery_percentage() {
 	# percentage displayed in the 2nd field of the 2nd row
 	if command_exists "pmset"; then
 		pmset -g batt | grep -o "[0-9]\{1,3\}%"
+	elif command_exists "acpi"; then
+		acpi -b | grep -m 1 -Eo "[0-9]+%"
 	elif command_exists "upower"; then
         # use DisplayDevice if available otherwise battery
 		local battery=$(upower -e | grep -E 'battery|DisplayDevice'| tail -n1)
@@ -26,8 +28,6 @@ print_battery_percentage() {
 		if [ -n "$energy" ] && [ -n "$energy_full" ]; then
 			echo $energy $energy_full | awk '{printf("%d%%", ($1/$2)*100)}'
 		fi
-	elif command_exists "acpi"; then
-		acpi -b | grep -m 1 -Eo "[0-9]+%"
 	elif command_exists "termux-battery-status"; then
 		termux-battery-status | jq -r '.percentage' | awk '{printf("%d%%", $1)}'
 	elif command_exists "apm"; then

scripts/battery_remain.sh

@@ -112,10 +112,10 @@ acpi_battery_remaining_time() {
 print_battery_remain() {
 	if command_exists "pmset"; then
 		pmset_battery_remaining_time
-	elif command_exists "upower"; then
-		upower_battery_remaining_time
 	elif command_exists "acpi"; then
 		acpi_battery_remaining_time
+	elif command_exists "upower"; then
+		upower_battery_remaining_time
 	elif command_exists "apm"; then
 		apm_battery_remaining_time
 	fi

scripts/helpers.sh

@@ -30,12 +30,12 @@ command_exists() {
 battery_status() {
 	if command_exists "pmset"; then
 		pmset -g batt | awk -F '; *' 'NR==2 { print $2 }'
+	elif command_exists "acpi"; then
+		acpi -b | awk '{gsub(/,/, ""); print tolower($3); exit}'
 	elif command_exists "upower"; then
 		local battery
 		battery=$(upower -e | grep -E 'battery|DisplayDevice'| tail -n1)
 		upower -i $battery | awk '/state/ {print $2}'
-	elif command_exists "acpi"; then
-		acpi -b | awk '{gsub(/,/, ""); print tolower($3); exit}'
 	elif command_exists "termux-battery-status"; then
 		termux-battery-status | jq -r '.status' | awk '{printf("%s%", tolower($1))}'
 	elif command_exists "apm"; then