Changeset 953 for trunk

Timestamp:

09/30/13 12:54:27 (11 years ago)

Author:

labetoulle

Message:

RunChecker? : use getopts built-in function to parse command line options.

File:

• trunk/libIGCM/AA_RunChecker (modified) (2 diffs)

trunk/libIGCM/AA_RunChecker

@@ -45 +45 @@
 # Get arguments from command line
 # -------------------------------
-while [ $# -ne 0 ] ; do
-  case $1 in
-    -h|--help|-help)
+while getopts :hj:p:qsu: Opt ; do
+  case $Opt in
+    h)
       echo "usage: $0 [-u user] [-q] [-j n] [-s] job_name"
       echo "       $0 [-u user] [-q] [-j n] -p config.card_path"
+      echo "       $0 [-u user] [-q] [-j n] -r"
       echo ""
       echo "options :"
@@ -61 +62 @@
       echo "       the config.card instead of the job name."
       exit 0 ;;
-    -j|-job-number)
-      NbHisto="$2"
-      shift 2 ;;
-    -p|-config-path)
-      ConfigPath="$2"
+    j)
+      NbHisto=${OPTARG}
+      ;;
+    p)
       fg_path=true
-      shift 2 ;;
-    -q|-quiet)
+      ConfigPath=${OPTARG}
+      ;;
+    q)
       fg_quiet=true
-      shift 1 ;;
-    -s|-search)
+      ;;
+    s)
       fg_search=true
-      shift 1 ;;
-    -u|-user)
-      TargetUsr="$2"
-      shift 2 ;;
-    -*)
-      $0 -h
-      exit ;;
-    *)
-      break ;;
+      ;;
+    u)
+      TargetUsr=${OPTARG}
+      ;;
+    :)
+      echo "$0: -"${OPTARG}" option: missing value"
+      exit 1
+      ;;
+    \?)
+      echo "$0: -"${OPTARG}" option: not supported"
+      exit 1
+      ;;
   esac
 done
-
-
-if ( ( ! ${fg_path} ) && [ $# -lt 1 ] ) ; then
+shift $(($OPTIND-1))
+
+if ( ( ! ${fg_path} ) && ( ! ${fg_running} ) && [ $# -lt 1 ] ) ; then
   $0 -h
   exit