Changeset 3051f95


Ignore:
Timestamp:
03/29/2006 07:47:45 PM (18 years ago)
Author:
George Boudreau <georgeb@…>
Branches:
experimental
Children:
c155162
Parents:
7f38b6d
Message:

common/func_validate_configs.sh,. removed display trace option, always display config values

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • common/func_validate_configs.sh

    r7f38b6d r3051f95  
    1818
    1919 if [[ ! "${TARGET32}" = "" ]]; then
    20     [[ $verbose = "1" ]] && echo -e "`eval echo $PARAM_VALS2`"
     20    echo -e "`eval echo $PARAM_VALS2`"
    2121 fi
    22  [[ $verbose = "1" ]] && echo -e "`eval echo $PARAM_VALS`"
     22 echo -e "`eval echo $PARAM_VALS`"
    2323
    2424 case "${ARCH}" in
    … …  
    8686    parameter list.
    8787
    88     input vars: $1 0/1 0=quiet, 1=verbose output
     88    input vars: none
    8989    externals:  color constants
    9090                PROGNAME (lfs,clfs,hlfs,blfs)
    … …  
    109109  local config_param
    110110  local validation_str
    111   local verbose=$1
    112111
    113112  write_error_and_die() {
    … …  
    122121     # This is the 'regexp' test available in bash-3.0..
    123122     # using it as a poor man's test for substring
    124      [[ $verbose = "1" ]] && echo -e "`eval echo $PARAM_VALS`"
     123     echo -e "`eval echo $PARAM_VALS`"
    125124     if [[ ! "${validation_str}" =~ "x${!config_param}x" ]] ; then
    126125       # parameter value entered is no good
    … …  
    135134      case $config_param in
    136135        BUILDDIR) # We cannot have an <empty> or </> root mount point
    137             [[ $verbose = "1" ]] && echo -e "`eval echo $PARAM_VALS`"
     136            echo -e "`eval echo $PARAM_VALS`"
    138137            if [[ "xx x/x" =~ "x${!config_param}x" ]]; then
    139138              write_error_and_die
    … …  
    158157
    159158      if [[ "${config_param}" = "LC_ALL" ]]; then
    160          [[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`"
     159         echo "`eval echo $PARAM_VALS`"
    161160         [[ -z "${!config_param}" ]] && continue
    162161          # See it the locale values exist on this machine
    … …  
    169168
    170169      if [[ "${config_param}" = "LANG" ]]; then
    171          [[ $verbose = "1" ]] && echo "`eval echo $PARAM_VALS`"
     170         echo "`eval echo $PARAM_VALS`"
    172171         [[ -z "${!config_param}" ]] && continue
    173172          # See it the locale values exist on this machine
    … …  
    181180
    182181      if [[ "${config_param}"  = "KEYMAP" ]]; then
    183          [[ $verbose = "1" ]] && echo "`eval echo $PARAM_VALS`"
     182         echo "`eval echo $PARAM_VALS`"
    184183         [[ "${!config_param}" = "none" ]] && continue
    185184         if [[ -e "/usr/share/kbd/keymaps/${!config_param}" ]] &&
    … …  
    192191
    193192      if [[ "${config_param}" = "SRC_ARCHIVE" ]]; then
    194          [[ $verbose = "1" ]] && echo -n "`eval echo $PARAM_VALS`"
     193         echo -n "`eval echo $PARAM_VALS`"
    195194         if [ ! -z ${SRC_ARCHIVE} ]; then
    196195           if [ ! -d ${SRC_ARCHIVE} ]; then
    … …  
    207206
    208207      if [[ "${config_param}" = "FSTAB" ]]; then
    209          [[ $verbose = "1" ]] && echo "`eval echo $PARAM_VALS`"
     208         echo "`eval echo $PARAM_VALS`"
    210209         [[ -z "${!config_param}" ]] && continue
    211210         if [[ -e "${!config_param}" ]] &&
    … …  
    218217
    219218      if [[ "${config_param}" = "BOOK" ]]; then
    220          [[ $verbose = "1" ]] && echo "`eval echo $PARAM_VALS`"
     219         echo "`eval echo $PARAM_VALS`"
    221220         [[ ! "${WC}" = 1 ]] && continue
    222221         [[ -z "${!config_param}" ]] && continue
    … …  
    230229
    231230      if [[ "${config_param}" = "CONFIG" ]]; then
    232          [[ $verbose = "1" ]] && echo "`eval echo $PARAM_VALS`"
     231         echo "`eval echo $PARAM_VALS`"
    233232         [[ -z "${!config_param}" ]] && continue
    234233         if [[ -e "${!config_param}" ]] &&
    … …  
    242241      if [[ "${config_param}" = "BOOT_CONFIG" ]]; then
    243242        if [[ "${METHOD}" = "boot" ]]; then
    244            [[ $verbose = "1" ]] && echo "`eval echo $PARAM_VALS`"
     243            echo "`eval echo $PARAM_VALS`"
    245244           # There must be a config file when the build method is 'boot'
    246245           [[ -e "${!config_param}" ]] && [[ -s "${!config_param}" ]] && continue

  • master.sh

    r7f38b6d r3051f95  
    423423echo "---------------${nl_}"
    424424
    425 validate_config     1 # 0/1  0-do not display values
     425validate_config
    426426echo "---------------${nl_}"
    427427
Note: See TracChangeset for help on using the changeset viewer.