Merge pull request #81 from bob8677/master

[instantos/instantOS.git] / status.sh

diff --git a/status.sh b/status.sh
index b501487..87915da 100755 (executable)
--- a/status.sh
+++ b/status.sh
@@ -4,6 +4,8 @@
 ## status monitor for instantWM ##
 ##################################
 
+# will be rewritten soon
+
 INTERNET="X"
 date=""
 
@@ -91,13 +93,18 @@ sleep 2
 while :; do
 
     for i in /tmp/instantos/status/*; do
-        date="${date}$(cat $i)"
+        date="${date}$(cat "$i")"
     done
 
     # date time
     date="$date^d^  $(date +'%d-%m')  ^c$DARKBACK^  $(date +'%H:%M')  "
     # volume
-    date="$date^c$LIGHTBACK^  A$(amixer get Master | grep -Eo '[0-9]{1,3}%' | head -1)  "
+    date="$date^c$LIGHTBACK^  A$(
+        {
+            amixer -D pulse get Master || amixer sget Master
+        } 2>/dev/null |
+            grep -Eo -m1 '1?[0-9]{1,2}%'
+    )  "
 
     # option to disable status text
     if [ -e ~/.instantsilent ] && [ -z "$FORCESTATUS" ]; then