zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some screen output look changes.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-08-12 15:33:33 +00:00
parent 4a7e066e2a
commit 249874a3d1
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
BLFS/libs/func_dependencies
View file

@ -62,7 +62,7 @@ inline_doc
ENTRY_START="<xi:include xmlns:xi=\"http://www.w3.org/2003/XInclude\" href=\"../" ENTRY_START="<xi:include xmlns:xi=\"http://www.w3.org/2003/XInclude\" href=\"../"
ENTRY_END="\"/>" ENTRY_END="\"/>"
echo -en "\tGenerating $TARGET dependencies tree ..." echo -e "\tGenerating $TARGET dependencies tree ..."
mkdir dependencies mkdir dependencies
@ -120,17 +120,13 @@ inline_doc
;; ;;
esac esac
#------------------P---
# Start with a clean depure.txt file
> depure.txt
#--------------------- #---------------------
# If have dependencies, write its XInclude and find sub-dependencies # If have dependencies, write its XInclude and find sub-dependencies
if [[ -f dependencies/$TARGET.dep ]]; then if [[ -f dependencies/$TARGET.dep ]]; then
mkdir xincludes && do_dependencies $TARGET mkdir xincludes && do_dependencies $TARGET
fi fi
echo "done" echo -e "\n\t... done"
} }
@ -320,9 +316,9 @@ inline_doc
# However, uncontrolled recursion will cause a seg-fault due to stack issues with local variables. # However, uncontrolled recursion will cause a seg-fault due to stack issues with local variables.
# #
set +e 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 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 set -e
# Include it when done # Include it when done

8
BLFS/libs/func_parser
View file

@ -22,7 +22,7 @@ generate_TARGET_xml() { #
inline_doc inline_doc
local local
echo -en "\tGenerating $TARGET-index.xml ..." echo -en "\n\tGenerating $TARGET-index.xml ..."
#--------------------- #---------------------
# Header to $TARGET-index.xml # Header to $TARGET-index.xml
@ -98,7 +98,7 @@ generate_target_book() { #
inline_doc inline_doc
local filename # output filename 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 \ xsltproc --xinclude --nonet \
--stringparam mail_server $MAIL_SERVER \ --stringparam mail_server $MAIL_SERVER \
--stringparam xwindow $X11 \ --stringparam xwindow $X11 \
@ -138,11 +138,11 @@ inline_doc
# Log separator # Log separator
echo -e "\n\tScripts generation depuration and errors:\n" >> xsltproc.log 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 \ xsltproc --xinclude --nonet \
-o ./scripts/ ../libs/scripts.xsl \ -o ./scripts/ ../libs/scripts.xsl \
$TARGET-index.xml >> xsltproc.log 2>&1 $TARGET-index.xml >> xsltproc.log 2>&1
echo "done" echo -e "done\n"
# Make the scripts executable. # Make the scripts executable.
chmod -R +x scripts chmod -R +x scripts