X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=alarm;h=4b9639c92580c38099099441d9c2f953720450e3;hb=79334fd20b0bf56e3c4106900c0dd23445b0fb3f;hp=30648c3a0bb2b8d9bff0dcaa742482dcd7e775a6;hpb=d28e7b1f5990e8f4e08b8f0798590e85d632f11e;p=bin.git

diff --git a/alarm b/alarm
index 30648c3..4b9639c 100755
--- a/alarm
+++ b/alarm
@@ -1,19 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 SLEEP=$1;
 if [ -z "$SLEEP" ]; then
-    SLEEP="1s";
+    SLEEP="0.1s";
 fi;
+MPG321DEVICE="-o pulse"
 MUSIC=''
 MPG321OPTS="-n 300"
+cmd_exists () {
+    if which "$1" >/dev/null 2>&1; then
+        return 0;
+    else
+        return 1;
+    fi;
+}
+
+message() {
+    if cmd_exists "notify-send"; then
+        notify-send -t 4000 Alarm "your $SLEEP timer has expired";
+    fi;
+}
+
 for plantasia in ~/media/{audio,music}/mort_garson/plantasia/01_plantasia.mp3 \
                  ~/media/jack2/Plantasia/01\ Plantasia.mp3; do
                      
     if [ -e "${plantasia}" ]; then
         MUSIC="${plantasia}"
-        MPG321OPTS="-k 15 -n 224";
+        MPG321OPTS="-k 15 -n 209";
     fi;
 done;
-if [ -n "$MUSIC" ]; then
+if [ -z "$MUSIC" ]; then
     if [ -d ~/media/music ]; then
 	    MUSIC="$(find ~/media/music/ \( -type f -o -xtype f \) -iname '*.mp3' -print -quit)"
     fi;
@@ -21,4 +36,4 @@ if [ -n "$MUSIC" ]; then
 	    MUSIC="$(find ~/media/jack/ \( -type f -o -xtype f \) -iname '*.mp3' -print -quit)"
     fi;
 fi;
-(sleep $SLEEP; mpg321 $MPG321OPTS "$MUSIC" >/dev/null 2>&1 ) &
+(sleep $SLEEP; message; mpg321 $MPG321DEVICE $MPG321OPTS "$MUSIC" >/dev/null 2>&1 ) &