Changeset 11158

Timestamp:

2019-06-20T17:34:31+02:00 (4 years ago)

Author:

mathiot

Message:

replace hard coded svn command by ${SVN_CMD} (ticket #2239)

Location:

NEMO/branches/2019/fix_sette_ticket2239

Files:

• all_functions.sh (modified) (2 diffs)
• sette_rpt.sh (modified) (1 diff)

NEMO/branches/2019/fix_sette_ticket2239/all_functions.sh

@@ -94 +94 @@
 set_valid_dir () {
     LANG=en_US
-    REVISION_NB=`LC_MESSAGES=${LANG} svn info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'`
+    REVISION_NB=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'`
     if [ ${#REVISION_NB} -eq 0 ]
     then
-        echo "some problems with svn info command"
-        echo "some problems with svn info command" >> ${SETTE_DIR}/output.sette
+        echo "some problems with ${SVN_CMD} info command"
+        echo "some problems with ${SVN_CMD} info command" >> ${SETTE_DIR}/output.sette
         REVISION_NB=`date +%Y%m%d`
         echo "put in ${REVISION_NB} date"
@@ -105 +105 @@
     echo "value of revision number of NEMOGCM: ${REVISION_NB}"
     fi
-    [ `svn status -q ${SETTE_DIR}/../{cfg,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+
+    [ `${SVN_CMD} status -q ${SETTE_DIR}/../{cfg,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+
     NEMO_VALID=${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME}
 }

NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

@@ -451 +451 @@
 branchname=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'`
 echo "Current code is : $branchname @ r$revision  ( last change @ r$lastchange )"
-[ `svn status -q ${MAIN_DIR}/{cfg,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+
+[ `${SVN_CMD} status -q ${MAIN_DIR}/{cfg,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+
 
 # overwrite revision is argument 1 present