r2597 - in jhalfs/trunk: . common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Apr 29 08:08:14 PDT 2006


Author: manuel
Date: 2006-04-29 09:08:13 -0600 (Sat, 29 Apr 2006)
New Revision: 2597

Modified:
   jhalfs/trunk/common/common-functions
   jhalfs/trunk/common/func_validate_configs.sh
   jhalfs/trunk/master.sh
Log:
Mixed fix.

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-04-29 14:44:29 UTC (rev 2596)
+++ jhalfs/trunk/common/common-functions	2006-04-29 15:08:13 UTC (rev 2597)
@@ -49,7 +49,6 @@
 ${BOLD}  -B, --book VER${OFF}
         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}
         use DIR directory for building ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF}; all files jhalfs produces
@@ -81,9 +80,9 @@
          the final system packages wil be rebuilded the times defined in the
          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}
         use FILE as the /etc/fstab file for the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} system. If not specified,

Modified: jhalfs/trunk/common/func_validate_configs.sh
===================================================================
--- jhalfs/trunk/common/func_validate_configs.sh	2006-04-29 14:44:29 UTC (rev 2596)
+++ jhalfs/trunk/common/func_validate_configs.sh	2006-04-29 15:08:13 UTC (rev 2597)
@@ -174,7 +174,7 @@
                   [[ "xx x/x" =~ "x${!config_param}x" ]] &&
                        write_error_and_die
                   ;;
-      TIMEZONE)   ;;
+      TIMEZONE)   echo -e "`eval echo $PARAM_VALS`" ;;
 
       # Validate general parameters..
       HPKG)       validate_against_str "x0x x1x" ;;
@@ -219,9 +219,8 @@
       BOOK)        if [[ "${WC}" = "1" ]] ; then
                      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:
       #  fatal   -z -d -w,

Modified: jhalfs/trunk/master.sh
===================================================================
--- jhalfs/trunk/master.sh	2006-04-29 14:44:29 UTC (rev 2596)
+++ jhalfs/trunk/master.sh	2006-04-29 15:08:13 UTC (rev 2597)
@@ -117,7 +117,6 @@
                  echo "For stable 6.1.1 book, please use jhalfs-0.2."
                  exit 0
                 ;;
-               udev*)  LFSVRS=udev_update   ;;
                * )
                  echo "$1 is an unsupported version at this time."
                  exit 0
@@ -234,7 +233,7 @@
                           COMPARE=1
         ;;
         *)
-          echo -e "\n$1 is an unknown analisys method."
+          echo -e "\n$1 is an unknown analysis method."
           exit 1
           ;;
       esac




More information about the alfs-log mailing list