Autostart: Make location more specific

[bin.git] / status

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