Changeset 2186 for issm/trunk/cron/nightlyrun.sh

Timestamp:

09/10/09 14:11:31 (16 years ago)

Author:

Mathieu Morlighem

Message:

some fixing

File:

• issm/trunk/cron/nightlyrun.sh (modified) (6 diffs)

issm/trunk/cron/nightlyrun.sh

@@ -107 +107 @@
                         cd $ep
                         cp configs/$OS/* .
-                        ./install.sh $NUMCPUS
+                        ./install.sh $NUMCPUS_INSTALL
                         cd ..
                 done
@@ -135 +135 @@
         then
                 cd $ISSM_DIR/src/c
-                ./intel-compile.sh >> ../../c-compilation.log 2>&1
+                ./intel-compile.sh
                 cd $ISSM_DIR/src/mex
-                make install >> ../../mex-compilation.log 2>&1
+                make install
                 cd $ISSM_DIR
         else
-                make -j $NUMCPUS >> ../../cmex-compilation.log 2>&1
-                make -j $NUMCPUS install >> ../../cmex-compilation.log 2>&1
+                make -j $NUMCPUS_INSTALL
+                make -j $NUMCPUS_INSTALL install
         fi
 fi
@@ -162 +162 @@
 #Launch matlab and the nightly run script
 cd $ISSM_DIR/cron/
-./run.sh $NROPTIONS
+./run.sh $1
 ELAPSED_RUN=$(timer $INSTALL_TIME)
 ELAPSED_TOTAL=$(timer $START_TIME)
@@ -176 +176 @@
 exit
                 
-#send mail
-source cron/mailinglist
-for i in `echo $MAILINGLIST`; do
-
-        if [ "$OS" = "winxp32" ]
-        then
-                email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , operating system: $OS. " $i < report.html 
-        else 
-                if [ "$OS" = "linux64" ]
+#send mail if requested
+if [ "$SKIPMAIL" != "yes" ]
+then
+        source cron/mailinglist
+        for i in `echo $MAILINGLIST`; do
+
+                if [ "$OS" = "winxp32" ]
                 then
-                        cat - report.html <<HERE | /usr/lib/sendmail  -oi -t
+                        email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , operating system: $OS. " $i < report.html 
+                else 
+                        if [ "$OS" = "linux64" ]
+                        then
+                                cat - report.html <<HERE | /usr/lib/sendmail  -oi -t
 From: "ISSM Nightly run" <$EMAIL_ADRESS>
 To: $i
@@ -194 +196 @@
 HERE
                 else
-                        cat - report.html <<HERE | /usr/sbin/sendmail  -oi -t
+cat - report.html <<HERE | /usr/sbin/sendmail  -oi -t
 From: "ISSM Nightly run" <$EMAIL_ADRESS>
 To: $i
@@ -201 +203 @@
 Content-Type: text/html
 HERE
+                        fi
                 fi
-        fi
-
-done
+        done
+fi