From a41031e2509db0f2202f92530063cf38a450911f Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Thu, 12 Feb 2004 19:03:52 +0000 Subject: [PATCH] * config/mailnotify (func_sendmail): Look for sendmail in a couple of common non-PATH locations as well. --- ChangeLog | 5 +++++ mailnotify | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50daf2dc3..2ebe500e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-12 Scott James Remnant + + * config/mailnotify (func_sendmail): Look for sendmail in a + couple of common non-PATH locations as well. + 2004-02-12 Gary V. Vaughan * commit, mailnotify: Use $progpath as for ltmain.in to work diff --git a/mailnotify b/mailnotify index d3221ebc6..a9b07d908 100755 --- a/mailnotify +++ b/mailnotify @@ -370,13 +370,21 @@ func_sendmail () from_name=`echo "$my_from" | sed 's, *<.*> *$,,;s,",,g'` from_addr=`echo "$my_from" | sed "$sed_mail_address"` + SENDMAIL=sendmail + for try_sendmail in sendmail /usr/lib/sendmail /usr/sbin/sendmail; do + if which $try_sendmail >/dev/null; then + SENDMAIL=$try_sendmail + break + fi + done + func_verbose "Delivering mail, please wait..." if test -n "$from_name"; then - sendmail -F "$from_name" -f "$from_addr" $my_destination < "$my_infile" + $SENDMAIL -F "$from_name" -f "$from_addr" $my_destination < "$my_infile" elif test -n "$from_addr"; then - sendmail -f "$from_addr" $my_destination < "$my_infile" + $SENDMAIL -f "$from_addr" $my_destination < "$my_infile" else - sendmail $my_destination < "$my_infile" + $SENDMAIL $my_destination < "$my_infile" fi if test $? -eq 0; then func_verbose "...succeeded." -- 2.47.3