r2930 - jhalfs/trunk/BLFS/libs

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Aug 12 08:33:33 PDT 2006


Author: manuel
Date: 2006-08-12 09:33:33 -0600 (Sat, 12 Aug 2006)
New Revision: 2930

Modified:
   jhalfs/trunk/BLFS/libs/func_dependencies
   jhalfs/trunk/BLFS/libs/func_parser
Log:
Some screen output look changes.

Modified: jhalfs/trunk/BLFS/libs/func_dependencies
===================================================================
--- jhalfs/trunk/BLFS/libs/func_dependencies	2006-08-12 14:47:31 UTC (rev 2929)
+++ jhalfs/trunk/BLFS/libs/func_dependencies	2006-08-12 15:33:33 UTC (rev 2930)
@@ -62,7 +62,7 @@
   ENTRY_START="<xi:include xmlns:xi=\"http://www.w3.org/2003/XInclude\" href=\"../"
   ENTRY_END="\"/>"
 
-  echo -en "\tGenerating $TARGET dependencies tree ..."
+  echo -e "\tGenerating $TARGET dependencies tree ..."
 
   mkdir dependencies
 
@@ -120,17 +120,13 @@
       ;;
   esac
 
-  #------------------P---
-  # Start with a clean depure.txt file
-  > depure.txt
-
   #---------------------
   # If have dependencies, write its XInclude and find sub-dependencies
   if [[ -f dependencies/$TARGET.dep ]]; then
     mkdir xincludes && do_dependencies $TARGET
   fi
 
-  echo "done"
+  echo -e "\n\t... done"
 }
 
 
@@ -320,9 +316,9 @@
 	# However, uncontrolled recursion will cause a seg-fault due to stack issues with local variables.
 	#
         set +e
-         [[ "${VERBOSITY}" > 0 ]] && echo -ne "\nrecursive call: $((++cntr)) ${spaceSTR:0:$cntr} ${RED}$DEP${OFF}"
+         [[ "${VERBOSITY}" > 0 ]] && echo -ne "\ncall: $((++cntr))${spaceSTR:0:$cntr}${RED}$DEP${OFF}"
             do_dependencies $DEP
-         [[ "${VERBOSITY}" > 0 ]] && echo -ne  "\n          ret:  $cntr ${spaceSTR:0:$((cntr--))} ${GREEN}$DEP${OFF}\tUsing the new xinclude file for PKG $DEP (to solve $PKG)"
+         [[ "${VERBOSITY}" > 0 ]] && echo -ne "\n ret: $cntr${spaceSTR:0:$((cntr--))}${GREEN}$DEP${OFF}  Using $DEP Xinc to solve $PKG"
         set -e
 
         # Include it when done

Modified: jhalfs/trunk/BLFS/libs/func_parser
===================================================================
--- jhalfs/trunk/BLFS/libs/func_parser	2006-08-12 14:47:31 UTC (rev 2929)
+++ jhalfs/trunk/BLFS/libs/func_parser	2006-08-12 15:33:33 UTC (rev 2930)
@@ -22,7 +22,7 @@
 inline_doc
 
   local
-  echo -en "\tGenerating $TARGET-index.xml ..."
+  echo -en "\n\tGenerating $TARGET-index.xml ..."
 
   #---------------------
   # Header to $TARGET-index.xml
@@ -98,7 +98,7 @@
 inline_doc
 
   local filename # output filename
-  echo -en  "\tGenerating the HTML book for <$TARGET> from the xml files located in <$BLFS_XML>..."
+  echo -en  "\n\tGenerating <$TARGET> HTML book from <$BLFS_XML> xml files ..."
   xsltproc --xinclude --nonet \
            --stringparam mail_server $MAIL_SERVER \
            --stringparam xwindow $X11 \
@@ -138,11 +138,11 @@
   # Log separator
   echo -e "\n\tScripts generation depuration and errors:\n" >> xsltproc.log
 
-  echo -en  "\tGenerating the build scripts ..."
+  echo -en "\n\tGenerating the build scripts ..."
   xsltproc --xinclude --nonet \
            -o ./scripts/ ../libs/scripts.xsl \
            $TARGET-index.xml >> xsltproc.log 2>&1
-  echo "done"
+  echo -e "done\n"
     # Make the scripts executable.
   chmod -R +x scripts
 




More information about the alfs-log mailing list