Changeset 1617

Timestamp:

12/12/11 09:04:45 (12 years ago)

Author:

mmaipsl

Message:

Move temporary directory in tmp sub-directory. Check case of svn update in the sub-tree of a component.

File:

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

modipsl/trunk/util/script_diff_model

@@ -67 +67 @@
 
 MODIPSL_SAVE_NAME=modipsl_save_diff_$( date +%F_%H%M%S )
-echo "out directory in " ${MODIPSL_SAVE_NAME}
-MODIPSL_SAVE=${MODIPSL}/${MODIPSL_SAVE_NAME}
+echo "SAVE directory in " ${MODIPSL_SAVE_NAME}
+MODIPSL_SAVE=${MODIPSL}/tmp/${MODIPSL_SAVE_NAME}
 printDebugArray MODIPSL_SAVE
 
@@ -74 +74 @@
     \( -not -path '*.svn*' -a -not -path '*CVS*' -a -not -path "${MODIPSL}/modipsl_save*" \
     -a -not -path "${MODIPSL}/bin" -a -not -path "${MODIPSL}/lib" -a -not -path "${MODIPSL}/util" \
-    -a -not -path "${MODIPSL}/tmp" \) \
+    -a -not -path "${MODIPSL}/tmp*" \) \
     -exec bash -c " echo "'{}'" | sed -e 's&"${MODIPSL}"/&&' | tee -a >( sed -e 's&\(.*\)&"${MODIPSL_SAVE}"/\1&' | xargs mkdir -p >> out_mkdir 2>&1 ) " \; )
 rm out_mkdir
@@ -181 +181 @@
                 ListPathBranch[$i]=${comp}
                 
-                svn diff ${filecomp} > ${MODIPSL}/svn_diff_${save_diff_file}
+                svn diff -r ${ListPathRev[$i]} ${filecomp} > ${MODIPSL}/svn_diff_${save_diff_file}
                 RET=$?
                 if [ $RET -gt 0 ] ; then
@@ -311 +311 @@
     ListPathRev[$i]=$( svn info | grep "R.vision_*:" | gawk -F  ' ' '{print $2}' )
     
-    svn diff > ${MODIPSL}/svn_diff_${save_diff_file}
+    svn diff -r ${ListPathRev[$i]} > ${MODIPSL}/svn_diff_${save_diff_file}
     RET=$?
     if [ $RET -gt 0 ] ; then