From b11c10be5005756cc4ef16d5ca0a94c12880cbd5 Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Wed, 21 Mar 2007 02:34:14 +0000
Subject: [PATCH] Minor formatting changes for consistency and a typo fix in
 the README.

---
 LFS/master.sh                |  2 +-
 README                       |  2 +-
 common/libs/func_book_parser | 20 +++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/LFS/master.sh b/LFS/master.sh
index e2265da..4f1345c 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -276,7 +276,7 @@ chapter6_Makefiles() {
 #----------------------------#
 chapter78_Makefiles() {
 #----------------------------#
-  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8 ( BOOT ) ${R_arrow}"
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8   ( BOOT ) ${R_arrow}"
 
   for file in chapter0{7,8}/* ; do
     # Keep the script file name
diff --git a/README b/README
index 12932d3..b2fde47 100644
--- a/README
+++ b/README
@@ -234,7 +234,7 @@ $Id$
 
     Q. "What is the function of "User account" and "Group account" menu settings?"
     A. If you are running jhalfs from a low or non-privileged account you may not
-       have the priv to create/delete the user needed to build temporally tools.
+       have the priv to create/delete the user needed to build temporary tools.
        These settings allow you to use your own user and group name to do that
        build steps.
 
diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index 82791f3..c09aed2 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -83,7 +83,7 @@ extract_commands() {         #
   # Dump the commands in shell script form from the HLFS book.
   case ${PROGNAME} in
     clfs)
-        echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture"
+        echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
         xsltproc --nonet \
                  --xinclude \
                  --stringparam method $METHOD \
@@ -97,7 +97,7 @@ extract_commands() {         #
       ;;
 
     clfs2)
-        echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture"
+        echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
         xsltproc --nonet \
                  --xinclude \
                  --stringparam vim-lang $VIMLANG \
@@ -108,7 +108,7 @@ extract_commands() {         #
       ;;
 
     clfs3)
-        echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture"
+        echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
         xsltproc --nonet \
                  --xinclude \
                  --stringparam vim-lang $VIMLANG \
@@ -119,7 +119,7 @@ extract_commands() {         #
       ;;
 
     hlfs)
-        echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS libc implementation"
+        echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS libc implementation... "
         xsltproc --nonet \
                  --xinclude \
                  --stringparam model $MODEL \
@@ -133,7 +133,7 @@ extract_commands() {         #
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
       ;;
     lfs)
-        echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build"
+        echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build... "
         xsltproc --nonet \
                  --xinclude \
                  --stringparam testsuite $TEST \
@@ -144,13 +144,13 @@ extract_commands() {         #
                  --stringparam lang $LANG \
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
       ;;
-    *)  echo -n " ${L_arrow}${BOLD}${PROGNAME}${R_arrow} book invalid, terminate build"
+    *)  echo -n " ${L_arrow}${BOLD}${PROGNAME}${R_arrow} book invalid, terminate build... "
         exit 1 ;;
   esac
 
   [[ "${BLFS_TOOL}" = "y" ]] && copy_blfs_deps_scripts
 
-  echo " ...OK"
+  echo "done"
 
   # Make the scripts executable.
   chmod -R +x $JHALFSDIR/${PROGNAME}-commands
@@ -169,7 +169,9 @@ create_package_list() {      #
 
   # Create the packages file. We need it for proper Makefile creation
   rm -f pkg_tarball_list
-  echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK $ARCH"
+  echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK"
+  if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
+  echo -n "... "
   case ${PROGNAME} in
     clfs | clfs2 | clfs3 )
         xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \
@@ -203,7 +205,7 @@ EOF
 ) >> pkg_tarball_list
   fi
 
-  echo " ...OK"
+  echo "done"
 
 }