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

diff --git a/alarm b/alarm
index 30648c3..61c6119 100755
--- a/alarm
+++ b/alarm
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 SLEEP=$1;
 if [ -z "$SLEEP" ]; then
-    SLEEP="1s";
+    SLEEP="0.1s";
 fi;
+MPG321DEVICE="-o pulse"
 MUSIC=''
 MPG321OPTS="-n 300"
 for plantasia in ~/media/{audio,music}/mort_garson/plantasia/01_plantasia.mp3 \
@@ -13,7 +14,7 @@ for plantasia in ~/media/{audio,music}/mort_garson/plantasia/01_plantasia.mp3 \
         MPG321OPTS="-k 15 -n 224";
     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 +22,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; mpg321 $MPG321DEVICE $MPG321OPTS "$MUSIC" >/dev/null 2>&1 ) &