Changeset 5929 for branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/install_new_branch.sh

Timestamp:

2015-11-26T16:55:09+01:00 (8 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS18_TRUST Last commits before merging to trunk

File:

• branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/install_new_branch.sh (modified) (7 diffs)

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/install_new_branch.sh

@@ -6 +6 @@
 ## Set defaults
 ##---------------------------------------------------
-TRUS_DIRE=$PWD
 TRUS_DBUG=0; TRUS_PROD=0; TRUS_HELP=0
 
@@ -16 +15 @@
    '-d'|'--debug'  ) TRUS_DBUG=1 ; shift  ;; '-j'|'--job'     ) TRUS_NPRO=$2; shift 2;;
    '-m'|'--machine') TRUS_HPCC=$2; shift 2;; '-h'|'--help'    ) TRUS_HELP=1 ; shift  ;;
-   '-u'|'--user'   ) TRUS_USER=$2; shift 2;; '-w'|'--workdir') TRUS_WORK=$2; shift 2;;
-   "*"             ) TRUS_HELP=1 ; shift  ;;
+   '-u'|'--user'   ) TRUS_USER=$2; shift 2;; "*"             ) TRUS_HELP=1 ; shift  ;;
     esac
 done
@@ -25 +23 @@
 ##---------------------------------------------------
 if [[ ! -e config/${TRUS_USER}.cfg || ! -e config/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then
-    cat trusting_help.txt
+    cat ./inc/trusting_help.txt
 
     if [ ${TRUS_HELP} -eq 0 ]; then
@@ -39 +37 @@
     exit 1
 else
-    . trusting.env
+    . ./inc/trusting.env
     [ ${TRUS_DBUG} -eq 1 ] && set -vx
 fi
@@ -53 +51 @@
 
     printf "\nInstallation of a working copy of '%s' branch in '%s'? " ${TRUS_BRAN} ${TRUS_WORK}
-    echo 'Type [Y|y|yes] to confirm, if not back to branches list number'
+    printf "\nType [Y|y|yes] to confirm, if not back to branches list number\n"
     read answer
     [[ $answer == 'Y' || $answer == 'y' || $answer == 'yes' ]] && break
@@ -72 +70 @@
 
 for elmt in ${TRUS_CKOT}; do
+    [ $elmt == '\' ] && continue
     printf "%s " $elmt
 
@@ -90 +89 @@
 if [ $( find ARCH -name arch-${TRUS_HPCC}.fcm ) ]; then
     echo 'Compile NEMO rebuild tool'
-    cd TOOLS && ./maketools -n REBUILD_NEMO -m ${TRUS_HPCC} -j ${TRUS_NPRO} > /dev/null
-    [ $? -eq 0 ] && printf "\033[0;32mOK\033[0m" || printf "\033[0;31mKO\033[0m"
+    cd TOOLS && ./maketools -n REBUILD_NEMO -m ${TRUS_HPCC} -j ${TRUS_NPRO} >& /dev/null
+    [ -e REBUILD_NEMO/rebuild_nemo.exe ] && printf "\033[0;32mOK\033[0m" || printf "\033[0;31mKO\033[0m"
     printf "\n\n"
 else