Status: ISO 8601, code cleanup, add volume display

diff --git a/status b/status
index 9154162fd7b27ef8e2a218ec4c5e60fd92715023..e5e5138fbdd3f449cedf39237dc6d725f39ae318 100755 (executable)
--- a/status
+++ b/status
@@ -1,19 +1,23 @@
 #!/usr/bin/env bash
-# Sends a notification with battery level and time
+# Sends a notification with the time, battery level, and volume
 
-function time_set() {
-  date +%A", "%b" "%e", "%r
+time_set() {
+  date "+%A %Y-%m-%d, %r"
 }
 
-function power_set() {
-  upower -d | grep percentage | tail -c 5
+power_set() {
+  echo -n "$(upower -d | grep percentage | tail -c 5)"
   if [[ $(upower -d | grep "discharging") ]]; then
-    echo " battery,"
+    echo -n " battery,"
     echo "$(upower -d | grep "time to empty" | tail -c 15) remaining"
   else
-    echo " battery,"
+    echo -n " battery,"
     echo "$(upower -d | grep "time to full" | tail -c 15) until charged"
   fi
 }
 
-notify-send -i "clock" "`echo $(time_set)`" "`echo $(power_set)`"
+volume_set() {
+  echo "$(amixer sget Master | tail -n 1 | tail -c +21)"
+}
+
+notify-send "$(time_set)" "$(power_set)\n$(volume_set)"