fix(battery-remain): fix with acpi and @batt_remain_short option (#112)

kaniaorzel · web-flow · commit 48fae59ba450 · 2023-12-01T09:37:22.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/scripts/battery_remain.sh b/scripts/battery_remain.sh
@@ -106,7 +106,11 @@ upower_battery_remaining_time() {
 }
 
 acpi_battery_remaining_time() {
-	acpi -b | grep -m 1 -Eo "[0-9]+:[0-9]+:[0-9]+"
+	regex="[0-9]+:[0-9]+"
+	if ! $short; then
+		regex="$regex:[0-9]+"
+	fi
+	acpi -b | grep -m 1 -Eo "$regex"
 }
 
 print_battery_remain() {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,11 @@ upower_battery_remaining_time() {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`acpi_battery_remaining_time() {`
`109`		`- acpi -b \| grep -m 1 -Eo "[0-9]+:[0-9]+:[0-9]+"`
	`109`	`+ regex="[0-9]+:[0-9]+"`
	`110`	`+ if ! $short; then`
	`111`	`+ regex="$regex:[0-9]+"`
	`112`	`+ fi`
	`113`	`+ acpi -b \| grep -m 1 -Eo "$regex"`
`110`	`114`	`}`
`111`	`115`
`112`	`116`	`print_battery_remain() {`