--- mitgcm.org/scripts/check_outp	2015/06/13 16:27:20	1.44
+++ mitgcm.org/scripts/check_outp	2016/07/01 17:00:10	1.47
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.44 2015/06/13 16:27:20 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.47 2016/07/01 17:00:10 jmc Exp $
 #
 #  The purpose of this script is to compare
 #  the latest output with the previous one (from the same platform with
@@ -224,6 +224,7 @@
 OUTPFIL=`basename $0`'.log'
 NBLDIFF=5
 ADDRESS='none'
+MAILCMD="mail"
 dBug=f
 t4update=0
 sTime=`date`
@@ -386,8 +387,8 @@
 ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > $TMP.dir_all
 
 if test "x$MACHINES" = "x_All_" ; then
-  MACHINES="aces- acesgrid baudelaire danton iblade sx8 uv100 pleiades"
-  MACHINES="$MACHINES stomp octopus engaging saramago svante glacier"
+  MACHINES="aces- acesgrid baudelaire engaging svante glacier uv100 ollie stan1"
+  MACHINES="$MACHINES pleiades archer stomp octopus saramago"
 
   MALL=`cat $TMP.dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq`
   for madd in $MALL ; do
@@ -561,8 +562,13 @@
 rm -f $TMP.dir_all $TMP.slist $TMP.plist
 if test $OUTPFIL = "TTT.$$" ; then rm -f $OUTPFIL ; fi
 if test "x$ADDRESS" != 'xnone' ; then
-  echo ".. send $OUTPSUM to $ADDRESS"
-  mail -s $OUTPSUM $ADDRESS < $OUTPSUM
+  #- change default sender address ("From:") using "mail -r" option
+  #  since, by default, baudelaire uses USER@localhost.localdomain
+  fullNam=`hostname -A | awk '{print $1}'`
+  MAILCMD="$MAILCMD -r ${USER}@${fullNam}"
+  #---
+  echo ".. send $OUTPSUM to '$ADDRESS' using '$MAILCMD'"
+  $MAILCMD -s 'check_outp summary' $ADDRESS < $OUTPSUM
 fi
 echo ".. cat $OUTPSUM"
 cat $OUTPSUM