kayos/oh-my-bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugins/battery: Attempt to fix https://github.com/ohmybash/oh-my-bash/issues/68 (#104)

Browse Source 
Fixes: https://github.com/ohmybash/oh-my-bash/issues/68
This commit is contained in:
Kreyren 2020-02-17 03:46:33 +01:00 committed by GitHub
parent 27b55d1ea3
commit 7a3a7b01d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/battery/battery.plugin.sh
View File

@ -1,23 +1,26 @@
#!/usr/bin/env bash
# Bug: https://github.com/ohmybash/oh-my-bash/issues/68
if ! command -v "command_exists" >/dev/null; then command_exists() { command -v "$1" >/dev/null ; } fi
ac_adapter_connected(){
if _command_exists upower;
if command_exists upower;
then
upower -i $(upower -e | grep BAT) | grep 'state' | grep -q 'charging\|fully-charged'
return $?
elif _command_exists acpi;
elif command_exists acpi;
then
acpi -a | grep -q "on-line"
return $?
elif _command_exists pmset;
elif command_exists pmset;
then
pmset -g batt | grep -q 'AC Power'
return $?
elif _command_exists ioreg;
elif command_exists ioreg;
then
ioreg -n AppleSmartBattery -r | grep -q '"ExternalConnected" = Yes'
return $?
elif _command_exists WMIC;
elif command_exists WMIC;
then
WMIC Path Win32_Battery Get BatteryStatus /Format:List | grep -q 'BatteryStatus=2'
return $?
@ -25,23 +28,23 @@ ac_adapter_connected(){
}
ac_adapter_disconnected(){
if _command_exists upower;
if command_exists upower;
then
upower -i $(upower -e | grep BAT) | grep 'state' | grep -q 'discharging'
return $?
elif _command_exists acpi;
elif command_exists acpi;
then
acpi -a | grep -q "off-line"
return $?
elif _command_exists pmset;
elif command_exists pmset;
then
pmset -g batt | grep -q 'Battery Power'
return $?
elif _command_exists ioreg;
elif command_exists ioreg;
then
ioreg -n AppleSmartBattery -r | grep -q '"ExternalConnected" = No'
return $?
elif _command_exists WMIC;
elif command_exists WMIC;
then
WMIC Path Win32_Battery Get BatteryStatus /Format:List | grep -q 'BatteryStatus=1'
return $?
@ -52,11 +55,11 @@ battery_percentage(){
about 'displays battery charge as a percentage of full (100%)'
group 'battery'
if _command_exists upower;
if command_exists upower;
then
local UPOWER_OUTPUT=$(upower --show-info $(upower --enumerate | grep BAT) | grep percentage | tail --bytes 5)
echo ${UPOWER_OUTPUT: : -1}
elif _command_exists acpi;
elif command_exists acpi;
then
local ACPI_OUTPUT=$(acpi -b)
case $ACPI_OUTPUT in
@ -83,7 +86,7 @@ battery_percentage(){
echo '-1'
;;
esac
elif _command_exists pmset;
elif command_exists pmset;
then
local PMSET_OUTPUT=$(pmset -g ps | sed -n 's/.*[[:blank:]]+*\(.*%\).*/\1/p')
case $PMSET_OUTPUT in
@ -94,7 +97,7 @@ battery_percentage(){
echo $PMSET_OUTPUT | head -c 2
;;
esac
elif _command_exists ioreg;
elif command_exists ioreg;
then
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
@ -105,7 +108,7 @@ battery_percentage(){
echo $IOREG_OUTPUT | head -c 2
;;
esac
elif _command_exists WMIC;
elif command_exists WMIC;
then
local WINPC=$(echo porcent=$(WMIC PATH Win32_Battery Get EstimatedChargeRemaining /Format:List) | grep -o '[0-9]*')
case $WINPC in