Changeset 2142

Timestamp:

08/07/13 15:53:50 (11 years ago)

Author:

labetoulle

Message:

Add JobName? validation in ins_job:

• JobName? must start with a letter;
• it may only contain alphanumerical characters, "." and "-".

(See libIGCM #144)

File:

• modipsl/trunk/util/ins_job (modified) (4 diffs)

modipsl/trunk/util/ins_job

@@ -29 +29 @@
    [[ ${x_v} = 'verbose' ]] && print - "You must delete this file to update !";
 }
+
+function ins_job_Check_JobName
+{
+  verif=${JobName##[a-zA-Z]*(?([.\-])[a-zA-Z0-9])}
+
+  if [ ${#verif} -ne 0 ] ; then
+    echo "################ ERROR ################"
+    echo "${JobName} is invalid."
+    echo "- JobName can only contain alphanumeric characters, \".\" and \"-\""
+    echo "- JobName must start with a letter"
+
+    ((NbErr=NbErr+1))
+
+    Status=1
+  else
+    Status=0
+  fi
+
+  return ${Status}
+}
+
 #-
 #     dirname     and      basename
@@ -110 +131 @@
 fi
 
+NbErr=0
+
 #-
 # Define Project ID to set up jobs header for Curie (TGCC)
@@ -191 +214 @@
     JobName=${config_UserChoices_JobName}
   fi
+
+  # Check JobName validity : only alphanumerical characters, "-" and "." are authorized
+  ins_job_Check_JobName
+  RetCode=$?
+  [[ $RetCode -gt 0 ]] && continue
+
   [[ ${x_v} = 'verbose' ]] && echo "JobName=${JobName}"
 
@@ -294 +323 @@
 # That's all folks
 #-
+
+if [ ${NbErr} -ne 0 ] ; then
+  echo "################ ERROR ################"
+  echo "${NbErr} invalid JobName(s) found, check the log"
+fi
+
+
 exit 0;