Adjust testreport alternative results-sending option (#898)

* adjust criteria for rarely used option

adjust criteria for "alternative way to send testreport results",
i.e., when "scp" is used instead of "mpack".

* restore permissions

* document minor adjustment to testreport

doc/tag-index

@@ -1,6 +1,10 @@
     Notes on tags used in MITgcmUV
     ==============================
 
+o testreport:
+ - improve way of sending results tar file with "scp", now allowing to combine
+   "ssh" then "scp".
+
 checkpoint69c (2024/12/06)
 o pkg/mom_common,fluxform,vecinv:
   - remove ISOTROPIC_COS_SCALING code from pkg/mom_vecinv/mom_vi_hdissip.F (was

tools/do_tst_2+2

@@ -271,12 +271,12 @@ if test "x$ADDRESS" != xNONE -a "x$ADDRESS" != x ; then
       fi
     fi
     if test "x$SENDCMD" != x ; then
-        SendOpt='' ; headCMD=`echo $SENDCMD | awk '{print $1}'`
-        if test $headCMD != 'scp' ; then SendOpt='-s MITgcm-test -m 3555000' ; fi
-        #echo " run: $SENDCMD $SendOpt ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES"
+        sendOpt='' ; nb=`echo $SENDCMD | grep -c '\<scp\>'`
+        if [ $nb -eq 0 ] ; then sendOpt='-s MITgcm-test -m 3555000' ; fi
+        #echo " run: $SENDCMD $sendOpt ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES"
         tar -cf  ${SAVDIR}/${DRESULTS}".tar" $DRESULTS > /dev/null 2>&1 \
             && gzip  ${SAVDIR}/${DRESULTS}".tar" \
-            && $SENDCMD $SendOpt ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESS
+            && $SENDCMD $sendOpt ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESS
         out=$?
         if test "x$out" != x0 ; then
             echo

verification/testreport

@@ -1051,7 +1051,6 @@ scandirs()
     fi
 }
 
-
 check_eedata()
 {
     # check_eedata eedata size.h
@@ -1094,7 +1093,6 @@ check_eedata()
 
 ###############################################################################
 
-
 #  Default properties
 debug=0
 verbose=1
@@ -1907,14 +1905,14 @@ if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
     echo "No results email was sent."
 else
     if test "x$SENDCMD" != x ; then
-	SendOpt='' ; headCMD=`echo $SENDCMD | awk '{print $1}'`
-	if test $headCMD != 'scp' ; then SendOpt='-s MITgcm-test -m 3555000' ; fi
+	sendOpt='' ; nb=`echo $SENDCMD | grep -c '\<scp\>'`
+	if [ $nb -eq 0 ] ; then sendOpt='-s MITgcm-test -m 3555000' ; fi
 	if [ $verbose -gt 1 ]; then
-	   echo " run: $SENDCMD $SendOpt ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES"
+	   echo " run: $SENDCMD $sendOpt ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES"
 	fi
 	tar -cf ${SAVDIR}/${DRESULTS}".tar" $DRESULTS > /dev/null 2>&1 \
 	    && gzip ${SAVDIR}/${DRESULTS}".tar" \
-	    && $SENDCMD $SendOpt ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES
+	    && $SENDCMD $sendOpt ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES
 	RETVAL=$?
 	if test "x$RETVAL" != x0 ; then
 	    echo