Changeset 9673 for utils

Timestamp:

2018-05-29T14:49:26+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Bugfix for new makenemo

File:

• utils/build/makenemo (modified) (2 diffs)

utils/build/makenemo

@@ -194 +194 @@
 ## No ref. cfg, demo case, nor remote cfg selected
 if [[ -z "${REF_CONF}" && -z "${DEMO_CONF}" && -z "${RMT_CONF}" ]]; then
-   conf_file='work_cfgs.txt'
 
       ## Reuse last configuration compiled if any (existing 'work_cfgs.txt')
       if [[ $( find ./cfgs ./tests -name work_cfgs.txt ) ]]; then
          CONFIG_DIR=${MAIN_DIR}/$( ls -rt */work_cfgs.txt | awk -F/ 'END{ print $1}' )
-         TML_CONF=$( tail -1 ${CONFIG_DIR}/${conf_file} | awk '{ print $1 }' )
+         TML_CONF=$( tail -1 ${CONFIG_DIR}/work_cfgs.txt | awk '{ print $1 }' )
       else
          ## No ${REF_CONF}, ${DEMO_CONF}, ${RMT_CONF} nor ${NEM_SUBDIR} and 1st compilation => exit
-         echo -e "\033[0;33m\nNo previous compilation found!"
+         echo -e "\033[0;33m\nNo previous build found!"
          echo -e "\033[0;31m\nAt least a reference configuration ('-r'), a demonstration case ('-a'), "
          echo -e "a remote configuration ('-u') or a set of NEMO sub-components ('-d') "
@@ -263 +262 @@
    fi
 
-fi
-
-[[ -z "${NEW_CONF}" || "${TML_CONF}" == "${NEW_CONF}" ]] && NEW_CONF=${TML_CONF}'_WK'
+   [[ -z "${NEW_CONF}" || "${TML_CONF}" == "${NEW_CONF}" ]] && NEW_CONF=${TML_CONF}'_WK'
+
+fi
+
 export NEMO_TDIR=${x_t:-$CONFIG_DIR}