From ceb610585a222d11681f25201e367a58f69bad7d Mon Sep 17 00:00:00 2001
From: Arti Zirk <arti.zirk@gmail.com>
Date: Sun, 27 Feb 2022 13:15:20 +0200
Subject: [PATCH] rearrange battery i3blocks script

---
 .config/i3blocks/battery | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.config/i3blocks/battery b/.config/i3blocks/battery
index 9617431..ce88d1e 100755
--- a/.config/i3blocks/battery
+++ b/.config/i3blocks/battery
@@ -1,10 +1,15 @@
 #!/bin/bash
 #cd "/sys/class/power_supply/$BLOCK_INSTANCE/"
 
-status=$(busctl get-property org.freedesktop.UPower /org/freedesktop/UPower/devices/DisplayDevice org.freedesktop.UPower.Device State | cut -d' ' -f2)
-charge_f=$(busctl get-property org.freedesktop.UPower /org/freedesktop/UPower/devices/DisplayDevice org.freedesktop.UPower.Device Percentage | cut -d' ' -f2)
+print_dev_status() {
+	dev_path=$1
+	status=$(busctl get-property org.freedesktop.UPower $dev_path org.freedesktop.UPower.Device State | cut -d' ' -f2)
+	charge_f=$(busctl get-property org.freedesktop.UPower $dev_path org.freedesktop.UPower.Device Percentage | cut -d' ' -f2)
 
-echo -e "$charge_f %"
+	echo -e "$charge_f %"
+}
+
+print_dev_status '/org/freedesktop/UPower/devices/DisplayDevice'
 
 #if [[ "$charge_f" -lt 20 ]]; then
 #    printf '\uf244'