Changeset 2200

Timestamp:

09/11/09 07:07:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed path problem

Location:

issm/trunk/cron

Files:

• nightlyrun.sh (modified) (4 diffs)
• run.sh (modified) (1 diff)

issm/trunk/cron/nightlyrun.sh

@@ -45 +45 @@
         exit 1
 fi
+source $1;
+export ISSM_DIR
+export ISSM_ARCH
 
 #launch nightly run (get start time)
-source $1;
 TODAY=$(todaydate);
 HOST_NAME=$(host_name $OS);
-START_TIME=$(timer)
+START_TIME=$(timer);
 ISSM_RELEASE="issm";
-
-#create ISSM variables
-export ISSM_DIR
-export ISSM_ARCH
+USER=$(whoami);
+INIT_PATH=$(pwd);
 
 #Checkout and install ISSM if required
@@ -149 +149 @@
 mkdir  $ISSM_DIR/test/Verification/NightlyRun
 cat << END > $ISSM_DIR/test/Verification/NightlyRun/nightly.log
-today:   $(echo $TODAY)
-user:    $(whoami)
-host:    $(echo $HOST_NAME)
-OS:      $(echo $OS)
-release: $(echo "issm")
+today:     $(echo $TODAY)
+user:      $(echo $USER)
+host:      $(echo $HOST_NAME)
+OS:        $(echo $OS)
+release:   $(echo $ISSM_RELEASE)
+init_path: $(echo $INIT_PATH)
 elapsed_install: $(echo $ELAPSED_INSTALL)
 END
@@ -162 +163 @@
 ELAPSED_RUN=$(timer $INSTALL_TIME)
 ELAPSED_TOTAL=$(timer $START_TIME)
-cat << END >> $ISSM_DIR/test/Verification/NightlyRun/nightly.log
-elapsed_run: $(echo $ELAPSED_RUN)
+cat << END >>  $ISSM_DIR/test/Verification/NightlyRun/nightly.log
+elapsed_run:   $(echo $ELAPSED_RUN)
 elapsed_total: $(echo $ELAPSED_TOTAL)
 END
@@ -176 +177 @@
 if [ "$SKIPMAIL" != "yes" ]
 then
+        echo "sending report..."
         source $ISSM_DIR/cron/mailinglist
         for i in `echo $MAILINGLIST`; do

issm/trunk/cron/run.sh

@@ -8 +8 @@
         exit 1
 fi
+INIT_PATH=`cat $ISSM_DIR/test/Verification/NightlyRun/nightly.log | grep "init_path" | awk '{print $2}'`
+cd INIT_PATH
 source $1;