From 4710e816ec37dad9c5a08705dd584f65740e89b9 Mon Sep 17 00:00:00 2001
From: Sam Nystrom <sam@samnystrom.dev>
Date: Wed, 14 Jun 2023 00:22:06 -0400
Subject: bin/statusbar: use printf and simplify munging

---
 bin/statusbar | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/bin/statusbar b/bin/statusbar
index dc4b3a3..3eb8057 100755
--- a/bin/statusbar
+++ b/bin/statusbar
@@ -1,16 +1,17 @@
-#!/bin/sh -eu
+#!/bin/sh -u
 
 volume() {
-	volume=$(pactl get-sink-volume @DEFAULT_SINK@ |
-		awk 'match($0, /\d+%/) { print substr($0, RSTART, RLENGTH-1) }')
-	if [ "$volume" -eq 0 ]; then
+	volume=$(pactl get-sink-volume @DEFAULT_SINK@ | sed -nE 's/.*\s([0-9]+)%.*/\1/p')
+	if [ "$(pactl get-sink-mute @DEFAULT_SINK@)" = "Mute: yes" ]; then
+		volume_symbol="󰝟"
+	elif [ "$volume" -eq 0 ]; then
 		volume_symbol=""
 	elif [ "$volume" -le 50 ]; then
 		volume_symbol=""
 	else
 		volume_symbol=""
 	fi
-	echo "<span foreground=\"#ed8796\">$volume_symbol $volume%</span>"
+	printf '<span foreground="#ed8796">%s %d%%</span>' "$volume_symbol" "$volume"
 }
 
 network() {
@@ -20,11 +21,12 @@ network() {
 	else
 		symbol="睊"
 	fi
-	echo "<span foreground=\"#f5a97f\">$symbol $ssid</span>"
+	printf '<span foreground="#f5a97f">%s %s</span>' "$symbol" "$ssid"
 }
 
 brightness() {
-	echo "<span foreground=\"#eed49f\"> $(brightnessctl -m | awk -F, '{ print $4 }')</span>"
+	brightness=$(brightnessctl -m | awk -F, '{ print $4 }')
+	printf '<span foreground="#eed49f"> %s</span>' "$brightness"
 }
 
 battery() {
@@ -44,14 +46,14 @@ battery() {
 		symbol=""
 		;;
 	esac
-	echo "<span foreground=\"#a6da95\">$symbol $capacity%</span>"
+	printf '<span foreground="#a6da95">%s %d%%</span>' "$symbol" "$capacity"
 }
 
 clock() {
-	echo "<span foreground=\"#7dc4e4\"> $(date '+%b %d %H:%M')</span>"
+	printf '<span foreground="#7dc4e4"> %s</span>' "$(date '+%b %d %H:%M')"
 }
 
 while true; do
-	somebar -c status "<span foreground=\"#cad3f5\">$(volume) | $(network) | $(brightness) | $(battery) | $(clock)</span>" || true
+	somebar -c status "<span foreground=\"#cad3f5\">$(volume) | $(network) | $(brightness) | $(battery) | $(clock)</span>"
 	sleep 0.2
 done
-- 
cgit v1.2.3