diff --git a/common/common-functions b/common/common-functions index cffe02c..e11fe9a 100644 --- a/common/common-functions +++ b/common/common-functions @@ -49,7 +49,6 @@ ${BOLD} -V, --version${OFF} ${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-X produces @@ -81,9 +80,9 @@ ${BOLD} -C, --comparasion TYPE${OFF} 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, diff --git a/common/func_validate_configs.sh b/common/func_validate_configs.sh index 801750b..851a6f1 100644 --- a/common/func_validate_configs.sh +++ b/common/func_validate_configs.sh @@ -174,7 +174,7 @@ inline_doc [[ "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 @@ inline_doc 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, diff --git a/master.sh b/master.sh index 2743642..df837a2 100755 --- a/master.sh +++ b/master.sh @@ -117,7 +117,6 @@ while test $# -gt 0 ; do 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 @@ while test $# -gt 0 ; do COMPARE=1 ;; *) - echo -e "\n$1 is an unknown analisys method." + echo -e "\n$1 is an unknown analysis method." exit 1 ;; esac