From 8010c3189e5ffee127bb3b6a0cf9fcbb58f0d4b1 Mon Sep 17 00:00:00 2001 From: Akemi Izuko Date: Sat, 23 Dec 2023 20:14:18 -0700 Subject: [PATCH] Fix swaybar lighting getter --- sway/swaybar_status.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sway/swaybar_status.sh b/sway/swaybar_status.sh index 9fab28f..bf874db 100755 --- a/sway/swaybar_status.sh +++ b/sway/swaybar_status.sh @@ -11,12 +11,18 @@ battery_charge() { } display_brightness() { + local x + if command -v ddcutil &>/dev/null; then - ddcutil getvcp 10 | awk ' - match($0, /[0-9]+,/) { printf "%s", substr($0, RSTART, RLENGTH - 1) }' - else - light -G | awk '{ split($0, a, "."); printf "%s", a[1] }' + x="$(ddcutil getvcp 10 2>/dev/null |\ + awk 'match($0, /[0-9]+,/) { printf "%s", substr($0, RSTART, RLENGTH - 1) }')" fi + + if [[ -z "$x" ]]; then + x="$(light -G | awk '{ split($0, a, "."); printf "%s", a[1] }')" + fi + + printf "%s" "$x" } get_volume() {