Changeset 961

Timestamp:

10/23/13 18:41:37 (11 years ago)

Author:

labetoulle

Message:

Bugfix for RunChecker? : restore -p option (problem with the loop used by -r option, #131).

Location:

trunk/libIGCM

Files:

• AA_RunChecker (modified) (3 diffs)
• libIGCM_check/libIGCM_check.ksh (modified) (2 diffs)

trunk/libIGCM/AA_RunChecker

@@ -48 +48 @@
   case $Opt in
     h)
-      echo "usage: $0 [-u user] [-q] [-j n] [-s] job_name"
+      echo "usage: $0 [-u user] [-q] [-j n] [-s] job_name [job_name2 ...]"
       echo "       $0 [-u user] [-q] [-j n] -p config.card_path"
-      echo "       $0 [-u user] [-q] [-j n] -r"
+      echo "       $0 [-u user] [-q] [-j n] -r [job_name job_name2 ...]"
       echo ""
       echo "options :"
@@ -106 +106 @@
 fi
 
+if ( ( ${fg_path} ) && ( ${fg_running} ) ) ; then
+  echo "You cannot use -r and -p at the same time"
+  exit
+fi
+
 
 # Load libIGCM library
@@ -134 +139 @@
 if [ $# -ge 1 ] ; then
   set -A JobNameList ${JobNameList[*]} ${*}
+elif ( ${fg_path} ) ; then
+  set -A JobNameList "Unknown"
 fi
 

trunk/libIGCM/libIGCM_check/libIGCM_check.ksh

@@ -124 +124 @@
 
   if ( [ ${NbOcc} -eq 0 ] && ( ${fg_path} ) ) ; then
+
+    if [ ! "$( echo ${ConfigPath} | cut -c 1 )" == "/" ] ; then
+      ConfigPath="${PWD}/${ConfigPath}"
+    fi
+
     set -A FileList $( ls ${ConfigPath}/Job_* )
     if [ X$FileList == X ] ; then
@@ -183 +188 @@
     1)
       if ( ${fg_new} ) ; then
-        JobName=${JobName:=$( basename ${FileList} | gawk -F"_" '{ print $2 }' )}
+#        JobName=${JobName:=$( basename ${FileList} | gawk -F"_" '{ print $2 }' )}
+        JobName=$( basename ${FileList} | gawk -F"_" '{ print $2 }' )
         SUBMIT_DIR=$( dirname ${FileList} )
         echo "${JobName} ${TargetUsr} ${HostName} ${SUBMIT_DIR}"