Changeset 1597

Timestamp:

08/06/09 07:45:12 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added function to get host name

File:

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

issm/trunk/cron/nightlyrun.sh

@@ -6 +6 @@
 function timer()
 {
+        #if no input: return time, else return elapsed time
         if [[ $# -eq 0 ]]; then
                 echo $(date '+%s')
@@ -21 +22 @@
         fi
 }
-function todaydate()
+function today_date()
 {
-        export today=`date | awk '{printf("%s-%s-%s",$2,$3,$6);}'`; 
+        #return today date
         suffix=`date | awk '{printf("%s-%s-%s",$2,$3,$6);}'`                     
-        echo $suffix;                    
+        echo $suffix;
+} 
+function host_name()
+{
+        #return host name depending on the OS
+        if [[ "$1" == "winxp32" ]] 
+        then
+                HOST_NAME=`hostname`;
+        else
+                HOST_NAME=`hostname -s`;
+        fi
+        echo $HOST_NAME;
 } 
 
@@ -41 +53 @@
 
 #create nightly run variables
-export TODAY=$(todaydate);
-export HOST_NAME=`hostname`;
+export TODAY=$(today_date);
+export HOST_NAME=$(host_name $OS);
 export ISSM_RELEASE="issm"
 export OS
+echo $HOST_NAME
+exit
 
 #create ISSM variables
@@ -149 +163 @@
 From: "ISSM Nightly run" <$EMAIL_ADRESS>
 To: $i
-Subject: Nightly runs of $ISSM_RELEASE , operating system: $OS.
+Subject: Nightly runs of $ISSM_RELEASE, operating system: $OS.
 Mime-Version: 1.0
 Content-Type: text/html
@@ -157 +171 @@
 From: "ISSM Nightly run" <$EMAIL_ADRESS>
 To: $i
-Subject: Nightly runs of $ISSM_RELEASE , operating system: $OS.
+Subject: Nightly runs of $ISSM_RELEASE, operating system: $OS.
 Mime-Version: 1.0
 Content-Type: text/html