Changeset 1733

Timestamp:

05/21/12 18:23:44 (12 years ago)

Author:

jgipsl

Message:

Added new functionnality in model :

In mod.def, if the component path is preceded with "DEFAULT:" then model will ask to confirm this path or to type a new path. model will also ask for the revision number for the same component. If argument -d (for default) the default components will be used.

For exemple, in mod.def config LMDZOR_v5 :
#-C- LMDZOR_v5 DEFAULT:LMDZ5/trunk 1575 11 LMDZ modeles

In this exemple, LMDZ5/trunk can be changed to LMDZ4/branches/LMDZ4_AR5 (or other). And revision number 1575 can be changed as wish.

File:

• modipsl/branches/newconfig/util/model (modified) (4 diffs)

modipsl/branches/newconfig/util/model

@@ -16 +16 @@
 #-
 m_n=""; m_a="checkout"; m_v='silencious'; no_tag='false';
-while getopts :hevH V
+# Option -d to take default set up without asking
+changeok='yes'
+while getopts :hevdH V
   do
     case $V in
@@ -22 +24 @@
       (e)  m_a='checkout';;
       (v)  m_v='verbose';;
+      (d)  changeok='no';;
       (H)  no_tag='true';;
       (:)  echo ${b_n}" : option $OPTARG : missing value" 1>&2;
@@ -189 +192 @@
     echo 'H            : suppress the tags and take the HEAD version';
     echo 'v            : verbose mode';
+    echo 'd            : extract default components without option to change';
     echo 'Defaults     : -e';
     echo ' ';
@@ -266 +270 @@
     zp=${m_p[${qi}]}; zs=${m_s[${qi}]};
     zd=${m_d[${qi}]}; zl=${m_l[${qi}]};
+
+# Maybe change some information marked with DEFAULT. 
+# Check if key word DEFAULT is used in component name
+    defcomp=$(echo ${zc} | awk -FDEFAULT: '{print $2}')
+    if [ X$defcomp != X ] ; then
+        if [ $changeok == 'yes' ] ; then
+            echo "=> Default component $defcomp can be changed."
+            echo "   Do you want to change this path ? Type new path or return for the above default."
+            read newcomp
+            echo "   Type revision number for chosen component version or return for $zt default value"
+            read newrev
+            if [ X$newcomp == X ] ; then
+                zc=$defcomp
+            else
+                zc=$newcomp
+            fi
+
+            if [ X$newrev != X ] ; then
+                zt=$newrev
+            fi
+        else
+            # changeok=no : Take default value#
+            zc=$defcomp
+        fi
+    fi
     [[ ${m_v} = 'verbose' ]] && \
      { echo '---';