Changeset 11158


Ignore:
Timestamp:
2019-06-20T17:34:31+02:00 (16 months ago)
Author:
mathiot
Message:

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

Location:
NEMO/branches/2019/fix_sette_ticket2239
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/fix_sette_ticket2239/all_functions.sh

    r11153 r11158  
    9494set_valid_dir () { 
    9595    LANG=en_US 
    96     REVISION_NB=`LC_MESSAGES=${LANG} svn info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'` 
     96    REVISION_NB=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'` 
    9797    if [ ${#REVISION_NB} -eq 0 ] 
    9898    then 
    99         echo "some problems with svn info command" 
    100         echo "some problems with svn info command" >> ${SETTE_DIR}/output.sette 
     99        echo "some problems with ${SVN_CMD} info command" 
     100        echo "some problems with ${SVN_CMD} info command" >> ${SETTE_DIR}/output.sette 
    101101        REVISION_NB=`date +%Y%m%d` 
    102102        echo "put in ${REVISION_NB} date" 
     
    105105    echo "value of revision number of NEMOGCM: ${REVISION_NB}" 
    106106    fi 
    107     [ `svn status -q ${SETTE_DIR}/../{cfg,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+ 
     107    [ `${SVN_CMD} status -q ${SETTE_DIR}/../{cfg,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+ 
    108108    NEMO_VALID=${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME} 
    109109} 
  • NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

    r11153 r11158  
    451451branchname=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'` 
    452452echo "Current code is : $branchname @ r$revision  ( last change @ r$lastchange )" 
    453 [ `svn status -q ${MAIN_DIR}/{cfg,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+ 
     453[ `${SVN_CMD} status -q ${MAIN_DIR}/{cfg,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+ 
    454454 
    455455# overwrite revision is argument 1 present 
Note: See TracChangeset for help on using the changeset viewer.