Changeset 2234

Timestamp:

04/07/14 17:56:53 (10 years ago)

Author:

jgipsl

Message:

Adapted script for special case IPSLCM6 without suffix _v6.

Location:

CONFIG/UNIFORM/v6

Files:

• diff_configurations.ksh (modified) (1 diff)
• propagate_master_config.ksh (modified) (2 diffs)

CONFIG/UNIFORM/v6/diff_configurations.ksh

@@ -16 +16 @@
 ConfigFamily=v6
 ConfigList=`ls |grep ${ConfigFamily} |grep -v out`
+ConfigList=$ConfigList" IPSLCM6" 
 verbose=no
 echo All configurations to tests : $ConfigList

CONFIG/UNIFORM/v6/propagate_master_config.ksh

@@ -21 +21 @@
 verbose=yes
 BaseDir=`pwd`
-ConfigFamily=$( echo $MasterConfig | awk -F"_" '{print $2}' )
-ConfigList=`ls |grep ${ConfigFamily} |grep -v out |grep -v $MasterConfig`
-
-echo  All modifications in configuration $MasterConfig will copied to the other configurations $ConfigList
+ConfigFamily=v6
+ConfigList=`ls |grep ${ConfigFamily} |grep -v out`
+ConfigList=$ConfigList" IPSLCM6" 
+echo  All modifications in configuration $MasterConfig will copied to the other configurations $ConfigList .
 
 cd $BaseDir/$MasterConfig
@@ -35 +35 @@
 
 for conf in $ConfigList ; do
-    for file in $FileList ; do
-        if [ -f ${conf}/${file} ] ; then 
-            cmp -s ${MasterConfig}/${file}  ${conf}/${file}
-            if [ $? -ne 0 ] ; then
-            # Files are differents
-                echo "cp ${MasterConfig}/${file} ${conf}/${file}" >> $cpfile
-                if [ $verbose == yes ] ; then
-                    diff  --brief ${MasterConfig}/${file}  ${conf}/${file}
-                    diff  ${MasterConfig}/${file}  ${conf}/${file}
-                fi          
+    # Only contiue if the config is not the MasterConfig
+    if [ $conf != $MasterConfig ] ; then
+        echo Do for conf= $conf and MasterConfig=$MasterConfig
+        for file in $FileList ; do
+            if [ -f ${conf}/${file} ] ; then 
+                cmp -s ${MasterConfig}/${file}  ${conf}/${file}
+                if [ $? -ne 0 ] ; then
+                    # Files are differents
+                    echo "cp ${MasterConfig}/${file} ${conf}/${file}" >> $cpfile
+                    if [ $verbose == yes ] ; then
+                        diff  --brief ${MasterConfig}/${file}  ${conf}/${file}
+                        diff  ${MasterConfig}/${file}  ${conf}/${file}
+                    fi      
+                fi
             fi
-        fi
-    done
-echo "" >> $cpfile
+        done
+        echo "" >> $cpfile
+    fi
 done