Author: pierre
Date: Thu Jun 29 07:15:36 2017
New Revision: 3971
Log:
Quote bash variables in arguments to --stringparam for xsltproc
Modified:
jhalfs/branches/2.4/common/libs/func_book_parser
jhalfs/branches/2.4/common/libs/func_download_pkgs
Modified: jhalfs/branches/2.4/common/libs/func_book_parser
==============================================================================
--- jhalfs/branches/2.4/common/libs/func_book_parser Thu Jun 29 07:10:30
2017 (r3970)
+++ jhalfs/branches/2.4/common/libs/func_book_parser Thu Jun 29 07:15:36
2017 (r3971)
@@ -95,46 +95,46 @@
case ${PROGNAME} in
clfs)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
- xsltproc --nonet \
- --xinclude \
- --stringparam method $METHOD \
- --stringparam testsuite $TEST \
- --stringparam bomb-testsuite $BOMB_TEST \
- --stringparam vim-lang $VIMLANG \
- --stringparam timezone $TIMEZONE \
- --stringparam page $PAGE \
- --stringparam lang $LANG \
- --stringparam sparc $SPARC64_PROC \
- --stringparam x86 $TARGET \
- --stringparam mips $TARGET \
- -o ./${PROGNAME}-commands/ \
- $XSL \
+ xsltproc --nonet \
+ --xinclude \
+ --stringparam method "$METHOD" \
+ --stringparam testsuite "$TEST" \
+ --stringparam bomb-testsuite "$BOMB_TEST" \
+ --stringparam vim-lang "$VIMLANG" \
+ --stringparam timezone "$TIMEZONE" \
+ --stringparam page "$PAGE" \
+ --stringparam lang "$LANG" \
+ --stringparam sparc "$SPARC64_PROC" \
+ --stringparam x86 "$TARGET" \
+ --stringparam mips "$TARGET" \
+ -o ./${PROGNAME}-commands/ \
+ $XSL \
$BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
;;
clfs2)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
- xsltproc --nonet \
- --xinclude \
- --stringparam vim-lang $VIMLANG \
- --stringparam timezone $TIMEZONE \
- --stringparam page $PAGE \
- --stringparam lang $LANG \
- --output ./${PROGNAME}-commands/ \
- $XSL \
+ xsltproc --nonet \
+ --xinclude \
+ --stringparam vim-lang "$VIMLANG" \
+ --stringparam timezone "$TIMEZONE" \
+ --stringparam page "$PAGE" \
+ --stringparam lang "$LANG" \
+ --output ./${PROGNAME}-commands/ \
+ $XSL \
$BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
;;
clfs3)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
- xsltproc --nonet \
- --xinclude \
- --stringparam endian x$ENDIAN \
- --stringparam timezone $TIMEZONE \
- --stringparam page $PAGE \
- --stringparam lang $LANG \
- --output ./${PROGNAME}-commands/ \
- $XSL \
+ xsltproc --nonet \
+ --xinclude \
+ --stringparam endian x$ENDIAN \
+ --stringparam timezone "$TIMEZONE" \
+ --stringparam page "$PAGE" \
+ --stringparam lang "$LANG" \
+ --output ./${PROGNAME}-commands/ \
+ $XSL \
$BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
;;
@@ -164,19 +164,19 @@
fi
popd > /dev/null
- xsltproc --nonet \
- --xinclude \
- --stringparam revision $INITSYS \
- --stringparam testsuite $TEST \
- --stringparam bomb-testsuite $BOMB_TEST \
- --stringparam vim-lang $VIMLANG \
- --stringparam full-locale $FULL_LOCALE \
- --stringparam timezone $TIMEZONE \
- --stringparam page $PAGE \
- --stringparam lang $LANG \
- --stringparam pkgmngt $PKGMNGT \
- --output ./${PROGNAME}-commands/ \
- $XSL \
+ xsltproc --nonet \
+ --xinclude \
+ --stringparam revision "$INITSYS" \
+ --stringparam testsuite "$TEST" \
+ --stringparam bomb-testsuite "$BOMB_TEST" \
+ --stringparam vim-lang "$VIMLANG" \
+ --stringparam full-locale "$FULL_LOCALE" \
+ --stringparam timezone "$TIMEZONE" \
+ --stringparam page "$PAGE" \
+ --stringparam lang "$LANG" \
+ --stringparam pkgmngt "$PKGMNGT" \
+ --output ./${PROGNAME}-commands/ \
+ $XSL \
$BOOK/index.xml >> $LOGDIR/$LOG 2>&1
;;
*) echo -n " ${L_arrow}${PROGNAME}${R_arrow} book invalid, terminate
build... "
@@ -214,19 +214,19 @@
$BOOK/BOOK/materials/${ARCH}-chapter.xml >>$LOGDIR/$LOG 2>&1
;;
hlfs)
- xsltproc --nonet --xinclude \
- --stringparam model $MODEL \
- --stringparam kernel $KERNEL \
- --output pkg_tarball_list \
- packages.xsl \
+ xsltproc --nonet --xinclude \
+ --stringparam model "$MODEL" \
+ --stringparam kernel "$KERNEL" \
+ --output pkg_tarball_list \
+ packages.xsl \
$BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
;;
lfs)
- xsltproc --nonet --xinclude \
- --stringparam pkgmngt $PKGMNGT \
- --stringparam revision $INITSYS \
- --output pkg_tarball_list \
- packages.xsl \
+ xsltproc --nonet --xinclude \
+ --stringparam pkgmngt "$PKGMNGT" \
+ --stringparam revision "$INITSYS" \
+ --output pkg_tarball_list \
+ packages.xsl \
$BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
;;
*)
Modified: jhalfs/branches/2.4/common/libs/func_download_pkgs
==============================================================================
--- jhalfs/branches/2.4/common/libs/func_download_pkgs Thu Jun 29 07:10:30
2017 (r3970)
+++ jhalfs/branches/2.4/common/libs/func_download_pkgs Thu Jun 29 07:15:36
2017 (r3971)
@@ -150,35 +150,35 @@
case ${PROGNAME} in
clfs*)
echo -n "Creating CLFS <${ARCH}> specific URLs file"
- xsltproc --nonet --xinclude \
- --stringparam server $SERVER \
- --stringparam family clfs \
- -o $BUILDDIR/sources/urls.lst \
- urls.xsl \
+ xsltproc --nonet --xinclude \
+ --stringparam server "$SERVER" \
+ --stringparam family clfs \
+ -o $BUILDDIR/sources/urls.lst \
+ urls.xsl \
$BOOK/BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK"
;;
hlfs)
echo -n "Creating HLFS <${MODEL}> + <${KERNEL}> specific URLs file"
- xsltproc --nonet --xinclude \
- --stringparam server $SERVER \
- --stringparam family lfs \
- --stringparam model $MODEL \
- --stringparam kernel $KERNEL \
- -o $BUILDDIR/sources/urls.lst \
- urls.xsl \
+ xsltproc --nonet --xinclude \
+ --stringparam server "$SERVER" \
+ --stringparam family lfs \
+ --stringparam model "$MODEL" \
+ --stringparam kernel "$KERNEL" \
+ -o $BUILDDIR/sources/urls.lst \
+ urls.xsl \
$BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK"
;;
lfs)
echo -n "Creating LFS specific URLs file"
- xsltproc --nonet --xinclude \
- --stringparam server $SERVER \
- --stringparam family lfs \
- --stringparam pkgmngt $PKGMNGT \
- --stringparam revision $INITSYS \
- --output ../sources/urls.lst \
- urls.xsl \
+ xsltproc --nonet --xinclude \
+ --stringparam server "$SERVER" \
+ --stringparam family lfs \
+ --stringparam pkgmngt "$PKGMNGT" \
+ --stringparam revision "$INITSYS" \
+ --output ../sources/urls.lst \
+ urls.xsl \
$BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK"
;;
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
