Changeset 1877

Timestamp:

09/13/12 14:31:21 (12 years ago)

Author:

jgipsl

Message:

Removed printing in default mode. Use './ins_job -v' for verbose mode

File:

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

modipsl/trunk/util/ins_job

@@ -24 +24 @@
 function ins_job_Warning
 {
-   print - "\n############### WARNING ###############";
-   print - "File ${n_f} already exists\nin directory ${j}";
-   print - "You must delete this file to update !";
+   [[ ${x_v} = 'verbose' ]] && print - "\n############### WARNING ###############";
+   [[ ${x_v} = 'verbose' ]] && print - "File ${n_f} already exists\nin directory ${j}";
+   [[ ${x_v} = 'verbose' ]] && print - "You must delete this file to update !";
 }
 #-
@@ -90 +90 @@
  }
 #-
-print - "\nInstallation of jobs for '${x_t}'";
+[[ ${x_v} = 'verbose' ]] && print - "\nInstallation of jobs for '${x_t}'";
 #-
 # Accessing to functions (without stack)
@@ -122 +122 @@
      continue
  else
-     print - "\nWorking with file ${F_CFG}\nin directory ${j}\nfor ${n_f}";
+     [[ ${x_v} = 'verbose' ]] && print - "\nWorking with file ${F_CFG}\nin directory ${j}\nfor ${n_f}";
  fi
 
@@ -128 +128 @@
  if [ -d ${j}/EXPERIMENTS ] && [ -d ${j}/GENERAL ] ; then
      # New Structure
-     echo "This is new configuration structure"
+     [[ ${x_v} = 'verbose' ]] && echo "This is new configuration structure"
      new_struct=yes
      resolfile=$j/.resol
@@ -163 +163 @@
      JobName=${config_UserChoices_JobName}
  fi
- echo "JobName=${JobName}"
+ [[ ${x_v} = 'verbose' ]] && echo "JobName=${JobName}"
 
 # Add specific treatment for new type of directory structure 
@@ -175 +175 @@
         exit 4
       else
-        echo "ExpType= ${config_UserChoices_ExpType}"
+        [[ ${x_v} = 'verbose' ]] && echo "ExpType= ${config_UserChoices_ExpType}"
       fi
 
@@ -182 +182 @@
           continue
       fi
+      echo "=> Submit directory ${JobName} will be created with cards from EXPERIMENTS/${config_UserChoices_ExpType}"
       cp -r ${j}/EXPERIMENTS/${config_UserChoices_ExpType} ${j}/${JobName}
       cp -r ${j}/GENERAL/* ${j}/${JobName}/.
@@ -188 +189 @@
       rm -f ${j}/${F_CFG}.bak
       j=${j}/${JobName}
-      echo new j=$j
+      [[ ${x_v} = 'verbose' ]] && echo new j=$j
   fi
 # end specific treatment for new type directory structure 
@@ -194 +195 @@
  [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; } || \
   {
-   print - "\nCopying file ${F_RCI}\nin directory ${j}";
+   [[ ${x_v} = 'verbose' ]] && print - "\nCopying file ${F_RCI}\nin directory ${j}";
    \cp ${F_RCI} ${j};
   }
@@ -201 +202 @@
  n_f='Job_'${JobName};
  [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; continue; }
- print - "\nWorking with file ${F_CFG}\nin directory ${j}\nfor ${n_f}";
+ [[ ${x_v} = 'verbose' ]] && print - "\nWorking with file ${F_CFG}\nin directory ${j}\nfor ${n_f}";
  sed -e "/^${W_W} */ s///" \
      -e "/^${W_P}/d"       \
@@ -221 +222 @@
  j=${i%/*}; n_f=${i_f#AA_}'.job';
  [[ -f ${j}'/'${n_f} ]] && { ins_job_Warning; continue; }
- print - "\nIn directory ${j}\n${i_f} -> ${n_f}"
+ [[ ${x_v} = 'verbose' ]] && print - "\nIn directory ${j}\n${i_f} -> ${n_f}"
  sed -e "/^${W_W} */ s///" \
      -e "s%::modipsl::%${F_MOD}%" \
@@ -250 +251 @@
 fi
 #-
-print - "";
+[[ ${x_v} = 'verbose' ]] && print - "";
 #-
 # That's all folks