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

Timestamp:

2017-12-01T18:51:27+01:00 (6 years ago)

Author:

nicolasmartin

Message:

Continuation of global refactoring of Trusting tool: modification of options list to maintain consistency with makenemo
After getting a code snippet on ​https://stackoverflow.com/questions/402377/using-getopts-in-bash-shell-script-to-get-long-and-short-command-line-options in order to handle short '-[a-z]' and long '[a-z]*=' options, I have modified the main trusting script to split betwwen:

• Short options reserved shared options with makenemo ( -[hjmnr])
• Long pattern for trusting specified options

File:

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

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

@@ -15 +15 @@
    '-d'|'--debug'  ) TRUST_FLAG_DEBUG=1 ; shift  ;; '-j'|'--job'    ) TRUST_COMPILE_NPROC=$2; shift 2;;
    '-m'|'--machine') TRUST_MAIN_HPCC=$2; shift 2;; '-h'|'--help'    ) TRUST_FLAG_HELP=1 ; shift  ;;
-   '-u'|'--user'   ) TRUST_MAIN_USER=$2; shift 2;; "*"             ) TRUST_FLAG_HELP=1 ; shift  ;;
+   '-u'|'--user'   ) TRUST_MAIN_SETUP=$2; shift 2;; "*"             ) TRUST_FLAG_HELP=1 ; shift  ;;
     esac
 done
@@ -22 +22 @@
 ## Initialization (HPC & user environment)
 ##---------------------------------------------------
-if [[ ! -e cfg/${TRUST_MAIN_USER}.cfg || ! -e cfg/${TRUST_MAIN_HPCC}.cfg || ${TRUST_FLAG_HELP} -eq 1 ]]; then
+if [[ ! -e cfg/${TRUST_MAIN_SETUP}.cfg || ! -e cfg/${TRUST_MAIN_HPCC}.cfg || ${TRUST_FLAG_HELP} -eq 1 ]]; then
     cat ./inc/trusting_help.txt
 
@@ -28 +28 @@
    printf "\n\n\033[0;33m"
    printf "At least one configuration (arch or user) file is missing or misspelled:"
-   printf "\t'%s'.cfg\t'%s'.cfg" ${TRUST_MAIN_USER} ${TRUST_MAIN_HPCC}
+   printf "\t'%s'.cfg\t'%s'.cfg" ${TRUST_MAIN_SETUP} ${TRUST_MAIN_HPCC}
    printf "\033[0m"
     fi