Changeset c58f330

Timestamp:

04/29/2006 03:11:30 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

3e7af38

Parents:

fe187bf

Message:

Merged r2597 from trunk.

Files:

• common/common-functions (modified) (2 diffs)
• common/func_validate_configs.sh (modified) (2 diffs)
• master.sh (modified) (2 diffs)

common/common-functions

@@ -50 +50 @@
         checkout VER version of the book. Supported versions at this time are:
         dev* | trunk | SVN     aliases for Development {C,H,B}LFS
-        udev*                  aliases for the LFS udev_update branch
 
 ${BOLD}  -D  --directory DIR${OFF}
@@ -82 +81 @@
          ITERATIONS config option.
          Analisys types allowed are:
-           ICA   = do the ICA analisys designed by Greg Schafer
-           farce = do the farce analisys designed by Ken Moffat
-           both  = perfom both ICA and farce analisys
+           ICA   = do the ICA analysis designed by Greg Schafer
+           farce = do the farce analysis designed by Ken Moffat
+           both  = perfom both ICA and farce analysis
 
 ${BOLD}  -F, --fstab FILE${OFF}

common/func_validate_configs.sh

@@ -175 +175 @@
                        write_error_and_die
                   ;;
-      TIMEZONE)   ;;
+      TIMEZONE)   echo -e "`eval echo $PARAM_VALS`" ;;
 
       # Validate general parameters..
@@ -220 +220 @@
                      validate_dir -z -d
                    else
-                     validate_against_str "x${PROGNAME}-developmentx xlfs-udev_updatex"
-                   fi
-                   ;;
+                     validate_against_str "x${PROGNAME}-developmentx"
+                   fi ;;
 
       # Validate directories, testable states:

master.sh

@@ -118 +118 @@
                  exit 0
                 ;;
-               udev*)  LFSVRS=udev_update   ;;
                * )
                  echo "$1 is an unsupported version at this time."
@@ -235 +234 @@
         ;;
         *)
-          echo -e "\n$1 is an unknown analisys method."
+          echo -e "\n$1 is an unknown analysis method."
           exit 1
           ;;