X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=bin%2FannounceEmail.pl;h=07cb6db25c5c77472886103c7f83a8cf7bd0f99f;hb=7e0b880ba9c56cfa877b4b6bf3d190b0ff027bdf;hp=7a76fc408ab3804c639ed33806469d7df85a8948;hpb=b19aff368e8114dd44bbd7e306b0946f060e3051;p=clearscm.git

diff --git a/bin/announceEmail.pl b/bin/announceEmail.pl
index 7a76fc4..07cb6db 100755
--- a/bin/announceEmail.pl
+++ b/bin/announceEmail.pl
@@ -73,8 +73,9 @@ use lib "$FindBin::Bin/../lib";
 
 use Display;
 use Logger;
-use Utils;
+use Speak;
 use TimeUtils;
+use Utils;
 
 my $defaultIMAPServer = 'defaria.com';
 my $IMAP;
@@ -152,23 +153,6 @@ sub Connect2IMAP() {
   return;
 } # Connect2IMAP
 
-sub Say($) {
-  my ($msg) = @_;
-
-  if (-f "$FindBin::Bin/shh") {
-    $log->msg("Not speaking because we were asked to be quiet - $msg");
-
-    return;
-  } # if
-
-  my ($status, @output) = Execute "/usr/local/bin/gt \"$msg\"";
-
-  $log->err("Unable to speak (Status: $status) - "
-          . join ("\n", @output), $status) if $status;
-
-  return;
-} # Say
-
 sub MonitorMail() {
   MONITORMAIL:
 
@@ -224,8 +208,8 @@ sub MonitorMail() {
 
     # Only announce if after 6 Am. Note this will announce up until
     # midnight but that's ok. I want midnight to 6 Am as silent time.
-    if ($hour >= 6) {
-      Say $msg;
+    if ($hour >= 7) {
+      speak $msg, $log;
       $log->msg($logmsg);
     } else {
       $log->msg("$logmsg [silent]");
@@ -267,7 +251,7 @@ END {
   if ($log) {
     my $msg = "$FindBin::Script ending unexpectedly!";
 
-    Say $msg;
+    speak $msg, $log;
 
     $log->err($msg);
   } # if
@@ -308,7 +292,7 @@ if ($opts{daemon}) {
 } # if
 
 $log = Logger->new(
-  path        => '/var/log',
+  path        => '/var/local/log',
   name        => "$Logger::me.$opts{name}",
   timestamped => 'yes',
   append      => 'yes',
@@ -324,7 +308,7 @@ if ($opts{username} =~ /(.*)\@/) {
 
 my $msg = "Now monitoring email for $opts{user}\@$opts{name}";
 
-Say $msg if $opts{announce};
+speak $msg, $log if $opts{announce};
 
 $log->msg($msg);