Ignore:
Timestamp:
2015-04-15T17:03:58+02:00 (6 years ago)
Author:
davestorkey
Message:

Merge in trunk changes up to rev 5107.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/CONFIG/makenemo

    r4990 r5213  
    200200       ;; 
    201201   add_key) 
    202        list_add_key=$2 
    203        export ${list_add_key} 
     202       # Checking void argument 
     203       [ ! -z $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 void argument 
     208       [ ! -z $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.