Ignore:
Timestamp:
2015-07-15T17:46:12+02:00 (5 years ago)
Author:
andrewryan
Message:

merged in latest version of trunk alongside changes to SAO_SRC to be compatible with latest OBS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/CONFIG/makenemo

    r5034 r5600  
    200200       ;; 
    201201   add_key) 
    202        list_add_key=$2 
    203        export ${list_add_key} 
     202            # Checking if argument has anything other than whitespace 
     203            [[ ! "$2" =~ ^\ +$ ]] && { list_add_key=$2; export ${list_add_key}; } 
    204204       shift 
    205205       ;; 
    206206   del_key) 
    207        list_del_key=$2 
    208        export ${list_del_key} 
     207            # Checking if argument has anything other than whitespace 
     208            [[ ! "$2" =~ ^\ +$ ]] && { list_del_key=$2; export ${list_del_key}; } 
    209209       shift 
    210210       ;; 
     
    316316fi 
    317317 
    318 #- At this stage new configuration has been added, 
    319 #- We add or remove keys 
    320 if [ ${#list_add_key} -ne 0 ] ; then 
    321     . ${COMPIL_DIR}/Fadd_keys.sh ${NEW_CONF} add_key ${list_add_key} 
    322 fi 
    323  
    324 if [ ${#list_del_key} -ne 0 ] ; then 
    325     . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key} 
    326 fi 
     318#- At this stage new configuration has been added, we add or remove keys 
     319[ ! -z "${list_add_key}" ] && { . ${COMPIL_DIR}/Fadd_keys.sh ${NEW_CONF} add_key ${list_add_key}; } 
     320[ ! -z "${list_del_key}" ] && { . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key}; } 
    327321 
    328322#- check that all keys are really existing... 
Note: See TracChangeset for help on using the changeset viewer.