Changeset 5607 for branches/2015
- Timestamp:
- 2015-07-17T17:03:30+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh
r5560 r5607 116 116 117 117 # If -v|--version option has been set, modify svn command 118 if [ $( echo ${NEMO_VERS} | grep "HEAD\|up\|update" ) ]; then118 if [ $( echo ${NEMO_VERS} | grep "HEAD\|up\|update" ) ]; then 119 119 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]*' ) 122 124 else 123 125 svn_cmd='svn '${svn_opt} … … 132 134 # For time being, just get revision number from XIOS 133 135 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}' ) 135 137 echo 'XIOS '${rev_loc} >> model.log 136 138 printf "XIOS rev.\n" > mesg_05_xios_${CFG_USER}_${CFG_ARCH}.txt … … 141 143 142 144 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}' ) 144 146 (( ${rev_loc} >= $rev )) && rev=${rev_loc} 145 147 done … … 182 184 cat ${TEST_DIR}/trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.txt >> trusting.mail 183 185 fi 184 mail -s "[trusting ${REFE_CONF} ] $ST $ERR" $EMAIL < trusting.mail186 mail -s "[trusting ${REFE_CONF} $BRANCH] $ST $ERR" $EMAIL < trusting.mail 185 187 fi 186 188 … … 222 224 fi 223 225 224 printf "Result .....\n$ERR\n" > mesg_03_result_${CFG_USER}_${CFG_ARCH}.txt226 printf "Result\n$ERR\n" > mesg_03_result_${CFG_USER}_${CFG_ARCH}.txt 225 227 226 228 # Save tested configuration if trusting failed
Note: See TracChangeset
for help on using the changeset viewer.