Changeset 21530e9 for common

Timestamp:

04/12/2006 09:47:32 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

b1c7734

Parents:

2034373

Message:

Ported r2525 and r2539 from trunk.
Typo fix.

File:

• common/func_validate_configs.sh (modified) (3 diffs)

common/func_validate_configs.sh

@@ -138 +138 @@
                       if [[ ! "${RUN_ICA}" = "1" ]] && [[ ! "${RUN_FARCE}" = "1" ]]; then
                          echo  "${nl_}${DD_BORDER}"
-                         echo  "You have have elected to analyse the build but have failed to select a tool." >&2
+                         echo  "You have elected to analyse the build but have failed to select a tool." >&2
                          echo  "Edit /common/config and set ${L_arrow}${BOLD}RUN_ICA${R_arrow} and/or ${L_arrow}${BOLD}RUN_FARCE${R_arrow} to the required values" >&2
                          echo  "${DD_BORDER}${nl_}"
-                         exit 1                      
+                         exit 1
                       fi
                     fi
@@ -166 +166 @@
       if [[ "${config_param}" = "LC_ALL" ]]; then
          echo "`eval echo $PARAM_VALS`"
-         [[ -z "${!config_param}" ]] && continue
+         [[ -z "${!config_param}" ]] && echo -e "\nVariable LC_ALL cannot be empty!" && write_error_and_die
           # See it the locale values exist on this machine
          if [[ "`locale -a | grep -c ${!config_param}`" > 0 ]]; then
@@ -177 +177 @@
       if [[ "${config_param}" = "LANG" ]]; then
          echo "`eval echo $PARAM_VALS`"
-         [[ -z "${!config_param}" ]] && continue
+         [[ -z "${!config_param}" ]] && echo -e "\nVariable LANG cannot be empty!" && write_error_and_die
           # See it the locale values exist on this machine
          if [[ "`locale -a | grep -c ${!config_param}`" > 0 ]]; then