X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=alarm;h=61c61197d0a0489a670ff1b9e77d290b9c8f0dfb;hb=7072dd6217d2a600f729188624f228b5700bd836;hp=07a5873cc02c677c0c350cf2f199388b54b464b8;hpb=74c2a33cbd00e0689eac98555891cb28f73ce63c;p=bin.git

diff --git a/alarm b/alarm
index 07a5873..61c6119 100755
--- a/alarm
+++ b/alarm
@@ -1,6 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 SLEEP=$1;
 if [ -z "$SLEEP" ]; then
-    SLEEP="15m";
+    SLEEP="0.1s";
 fi;
-(sleep $SLEEP; mpg123 -k 15 -n 224 '/home/don/media/jack/Plantasia/01 Plantasia.mp3' 2&>1 >/dev/null) &
+MPG321DEVICE="-o pulse"
+MUSIC=''
+MPG321OPTS="-n 300"
+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";
+    fi;
+done;
+if [ -z "$MUSIC" ]; then
+    if [ -d ~/media/music ]; then
+	    MUSIC="$(find ~/media/music/ \( -type f -o -xtype f \) -iname '*.mp3' -print -quit)"
+    fi;
+    if [ -d ~/media/jack ]; then
+	    MUSIC="$(find ~/media/jack/ \( -type f -o -xtype f \) -iname '*.mp3' -print -quit)"
+    fi;
+fi;
+(sleep $SLEEP; mpg321 $MPG321DEVICE $MPG321OPTS "$MUSIC" >/dev/null 2>&1 ) &