From 6550ff6dae4e24b874f0011f0d30818ffe6da7bb Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 9 May 2016 12:59:37 -0700 Subject: [PATCH] update alarm --- alarm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/alarm b/alarm index 30648c3..ee200a0 100755 --- a/alarm +++ b/alarm @@ -1,8 +1,10 @@ -#!/bin/sh +#!/bin/bash +set -x 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 +15,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 +23,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 ) & -- 2.39.2