Changeset 9130

Timestamp:

08/22/08 13:39:03 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/dowebplots (modified) (4 diffs)
• datacenter/scripts/scriptlauncher (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/08/22 Daniela Dorner
+
+   * datacenter/scripts/scriptlauncher:
+     - fixed bug in starting scripts with command line options
+
+   * datacenter/scripts/dowebplots:
+     - fixed bug (showplot was not executed in the mars directory)
+     - moved all general rsyncs to the end of the script
+
+
 
  2008/08/21 Daniela Dorner

trunk/MagicSoft/Mars/datacenter/scripts/dowebplots

@@ -127 +127 @@
 echo "For the following plots will be produced: "${all[@]} >> $scriptlog 2>&1
 
-
-# rsync subsystemdata, sequence and dataset files
-echo "do rsync for subsystem files" >> $scriptlog 2>&1
-rsync -av --delete $subsystempath/ $webpath/subsystemdata >> $scriptlog 2>&1
-
-echo "do rsync for sequence files" >> $scriptlog 2>&1
-rsync -av --delete $sequpath/ $webpath/sequences >> $scriptlog 2>&1
-
-echo "do rsync for dataset files" >> $scriptlog 2>&1
-rsync -av --delete $datasetpath/ $webpath/datasets >> $scriptlog 2>&1
-
-
 # using hour for lock => after 24 no new script is 
 #  started in case the previous is still running
@@ -144 +132 @@
 lockfile=$lockpath/${program}-${hour}h.txt
 checklock  >> $scriptlog 2>&1
+
+# make sure that ./showplot is executed from the right directory
+cd $mars 
 
 count=0
@@ -282 +273 @@
    if [ "$check" = "ok" ]
    then
-      printprocesslog "INFO procduing plots (psfile and png) for $rootfile"
+      printprocesslog "INFO producing plots (psfile and png) for $rootfile"
       if ! ls $rootfile >/dev/null 2>&1
       then
@@ -331 +322 @@
 done
 
-# rsync for complete directory delete removed sequences
+# rsync for complete directory (i.e. to delete removed sequences)
 echo "do rsync for callisto, star and ganymed files" >> $scriptlog 2>&1
 rsync -aLv --delete --exclude=*/*/20[01][0-9]*_[YI]_*[.]root --exclude=*/*.ps $datapath/{callisto,star,ganymed}/ $webpath/callisto >> $scriptlog 2>&1
 
+# rsync subsystemdata, sequence and dataset files
+echo "do rsync for subsystem files" >> $scriptlog 2>&1
+rsync -av --delete $subsystempath/ $webpath/subsystemdata >> $scriptlog 2>&1
+
+echo "do rsync for sequence files" >> $scriptlog 2>&1
+rsync -av --delete $sequpath/ $webpath/sequences >> $scriptlog 2>&1
+
+echo "do rsync for dataset files" >> $scriptlog 2>&1
+rsync -av --delete $datasetpath/ $webpath/datasets >> $scriptlog 2>&1
+
+
 lockfile=$lockpath/${program}-${hour}h.txt
 finish >> $scriptlog 2>&1

trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher

@@ -72 +72 @@
    then
       unset com[0]
-      args='-a args="'${com[@]}'"'
+      arguments="${com[@]}"
    fi
    echo " launching $1..." >> $scriptlog 2>&1
-   echo "/usr/local/bin/condor_submit -a path=$path -a prog=$prog $args -a date=$date -a dir=$runlogpath $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2" >> $scriptlog 2>&1
-   pid=`/usr/local/bin/condor_submit -a path=$path -a prog=$prog $args -a date=$date -a dir=$runlogpath $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2`
+   echo "/usr/local/bin/condor_submit -a path=$path -a prog=$prog -a args=\"$arguments\" -a date=$date -a dir=$runlogpath $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2" >> $scriptlog 2>&1
+   pid=`/usr/local/bin/condor_submit -a path=$path -a prog=$prog -a args="$arguments" -a date=$date -a dir=$runlogpath $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2`
    if [ "$pid" = "" ]
    then