Changeset 5607


Ignore:
Timestamp:
2015-07-17T17:03:30+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE SVN revision number correction & possibility to update with date

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5560 r5607  
    116116 
    117117    # If -v|--version option has been set, modify svn command 
    118     if   [ $( echo ${NEMO_VERS} | grep  "HEAD\|up\|update"   ) ]; then 
     118    if   [ $( echo ${NEMO_VERS} | grep  "HEAD\|up\|update"                     ) ]; then 
    119119   svn_cmd='svn update -r HEAD' 
    120     elif [ $( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' ) ]; then 
    121    svn_cmd='svn update -r '$( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' ) 
     120    elif [ $( echo ${NEMO_VERS} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) ]; then 
     121   svn_cmd='svn update -r '$( echo ${NEMO_VERS} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) 
     122    elif [ $( echo ${NEMO_VERS} | grep -o '[0-9]*'                             ) ]; then 
     123   svn_cmd='svn update -r '$( echo ${NEMO_VERS} | grep -o '[0-9]*' ) 
    122124    else 
    123125   svn_cmd='svn '${svn_opt} 
     
    132134   # For time being, just get revision number from XIOS 
    133135   if [ "$dir" == "${DIR_XIOS}" ]; then 
    134        rev_loc=$( svn info $dir | awk '(NR == 5) {print $NF}' ) 
     136       rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' ) 
    135137       echo   'XIOS '${rev_loc} >> model.log 
    136138       printf "XIOS rev.\n"     >  mesg_05_xios_${CFG_USER}_${CFG_ARCH}.txt 
     
    141143 
    142144   echo ${svn_cmd} $dir': '$( ${svn_cmd} $dir ) 
    143    rev_loc=$( svn info $dir | awk '(NR == 5) {print $NF}' ) 
     145   rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' ) 
    144146   (( ${rev_loc} >= $rev )) && rev=${rev_loc} 
    145147    done 
     
    182184     cat ${TEST_DIR}/trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.txt  >> trusting.mail 
    183185      fi 
    184       mail -s "[trusting ${REFE_CONF}] $ST $ERR" $EMAIL  <  trusting.mail 
     186      mail -s "[trusting ${REFE_CONF} $BRANCH] $ST $ERR" $EMAIL  <  trusting.mail 
    185187  fi 
    186188 
     
    222224    fi 
    223225 
    224     printf "Result.....\n$ERR\n" > mesg_03_result_${CFG_USER}_${CFG_ARCH}.txt 
     226    printf "Result\n$ERR\n" > mesg_03_result_${CFG_USER}_${CFG_ARCH}.txt 
    225227 
    226228    # Save tested configuration if trusting failed 
Note: See TracChangeset for help on using the changeset viewer.