Changeset 5580 for branches/UKMO/dev_r5107_xios_initialize_toyoce/NEMOGCM/CONFIG/makenemo

Timestamp:

2015-07-10T10:08:01+02:00 (9 years ago)

Author:

davestorkey

Message:

Finish upgrade of UKMO/dev_r5107_xios_initialize_toyoce branch to trunk revision 5518. (Previous commit only upgraded part of the repository).

File:

• branches/UKMO/dev_r5107_xios_initialize_toyoce/NEMOGCM/CONFIG/makenemo (modified) (2 diffs)

branches/UKMO/dev_r5107_xios_initialize_toyoce/NEMOGCM/CONFIG/makenemo

@@ -200 +200 @@
        ;;
    add_key)
-       # Checking void argument
-       [ ! -z $2 ] && { list_add_key=$2; export ${list_add_key}; }
+            # Checking if argument has anything other than whitespace
+            [[ ! "$2" =~ ^\ +$ ]] && { list_add_key=$2; export ${list_add_key}; }
        shift
        ;;
    del_key)
-       # Checking void argument
-       [ ! -z $2 ] && { list_del_key=$2; export ${list_del_key}; }
+            # Checking if argument has anything other than whitespace
+            [[ ! "$2" =~ ^\ +$ ]] && { list_del_key=$2; export ${list_del_key}; }
        shift
        ;;
@@ -317 +317 @@
 
 #- At this stage new configuration has been added, we add or remove keys
-[ ! -z ${list_add_key} ] && { . ${COMPIL_DIR}/Fadd_keys.sh ${NEW_CONF} add_key ${list_add_key}; }
-[ ! -z ${list_del_key} ] && { . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key}; }
+[ ! -z "${list_add_key}" ] && { . ${COMPIL_DIR}/Fadd_keys.sh ${NEW_CONF} add_key ${list_add_key}; }
+[ ! -z "${list_del_key}" ] && { . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key}; }
 
 #- check that all keys are really existing...