daemon: double check that the display is locked before speaking

[espeaktime] / src / espeaktime-now.sh

diff --git a/src/espeaktime-now.sh b/src/espeaktime-now.sh
index fe3c90a..503c341 100755 (executable)
--- a/src/espeaktime-now.sh
+++ b/src/espeaktime-now.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
 
-fname=/tmp/espeaktime-$$.wav
-espeak -w $fname $(date "+%H:%M")
+# if we ever get empty or bogus arguments, espeak will try to
+# read text from stdin, and hang -- prevent that.
+exec < /dev/null
 
-export PULSE_PROP="module-stream-restore.id=x-maemo-applet-profiles event.id=ringtone-preview"
-nice -n -5 play-sound $fname
+if [ "$EST_IGN_SILENT" = "1" ]; then
+       fname=/tmp/espeaktime-$$.wav
 
-rm -f $fname
+       export PULSE_PROP="module-stream-restore.id=x-maemo-applet-profiles event.id=ringtone-preview"
+       espeak -w $fname "${@}"
+       play-sound $fname
+       rm -f $fname
+else
+       exec espeak "${@}"
+fi