-#!/usr/bin/env sh
-notify-send -i "clock" "`date +%A" "%B" "%e" | "%1l:%M:%S `" "`upower -d | grep percentage | tail -c 4 | head -c 3 && echo " battery" && upower --dump | grep "time to empty" | tail -c 11 | head -c 11`"
+#!/usr/bin/env bash
+# Sends a notification with battery level and time
+function time_set() {
+ date +%A", "%b" "%e", "%r
+}
+function power_set() {
+ upower -d | grep percentage | tail -c 5
+ if [[ $(upower -d | grep "discharging") ]]; then
+ echo " battery,"
+ echo "$(upower -d | grep "time to empty" | tail -c 15) remaining"
+ else
+ echo " battery"
+ fi
+}
+
+notify-send -i "clock" "`echo $(time_set)`" "`echo $(power_set)`"