shell-user/oh-my-bash
1
0
Fork 0
mirror of https://github.com/ohmybash/oh-my-bash.git synced 2024-05-11 05:55:37 +00:00
Code Issues Projects Releases Wiki Activity

plugins/battery: Refactor "upower --show-info"

Browse Source
This commit is contained in:
Koichi Murase
2022-01-08 14:13:07 +09:00
parent 5cbaa84cc7
commit 4637e4bd2e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,10 +3,14 @@
# Bug: https://github.com/ohmybash/oh-my-bash/issues/68 # 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 if ! command -v "command_exists" >/dev/null; then command_exists() { command -v "$1" >/dev/null ; } fi
_omb_plugin_battery__upower_print_info() {
upower -i "$(upower -e | sed -n '/BAT/{p;q;}')"
}
ac_adapter_connected(){ ac_adapter_connected(){
if command_exists upower; if command_exists upower;
then then
upower -i $(upower -e | grep BAT) | grep -qE 'state[:[:blank:]]*(charging|fully-charged)' _omb_plugin_battery__upower_print_info | grep -qE 'state[:[:blank:]]*(charging|fully-charged)'
return $? return $?
elif command_exists acpi; elif command_exists acpi;
then then
@@ -30,7 +34,7 @@ ac_adapter_connected(){
ac_adapter_disconnected(){ ac_adapter_disconnected(){
if command_exists upower; if command_exists upower;
then then
upower -i $(upower -e | grep BAT) | grep 'state' | grep -q 'discharging' _omb_plugin_battery__upower_print_info | grep -qE 'state[:[:blank:]]*discharging'
return $? return $?
elif command_exists acpi; elif command_exists acpi;
then then
@@ -57,7 +61,7 @@ battery_percentage(){
if command_exists upower; if command_exists upower;
then then
local UPOWER_OUTPUT=$(upower --show-info $(upower --enumerate | grep BAT) | grep percentage | tail --bytes 5) local UPOWER_OUTPUT=$(_omb_plugin_battery__upower_print_info | grep percentage | tail --bytes 5)
echo ${UPOWER_OUTPUT: : -1} echo ${UPOWER_OUTPUT: : -1}
elif command_exists acpi; elif command_exists acpi;
then then