Quote bash variables in arguments to --stringparam for xsltproc
This commit is contained in:
parent
6990d80390
commit
a4acb1236b
2 changed files with 82 additions and 82 deletions
|
@ -95,46 +95,46 @@ extract_commands() { #
|
|||
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,29 +164,29 @@ extract_commands() { #
|
|||
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 \
|
||||
--stringparam wrap-install $WRAP_INSTALL \
|
||||
--stringparam hostname $HOSTNAME \
|
||||
--stringparam interface $INTERFACE \
|
||||
--stringparam ip $IP_ADDR \
|
||||
--stringparam gateway $GATEWAY \
|
||||
--stringparam prefix $PREFIX \
|
||||
--stringparam broadcast $BROADCAST \
|
||||
--stringparam domain $DOMAIN \
|
||||
--stringparam nameserver1 $DNS1 \
|
||||
--stringparam nameserver2 $DNS2 \
|
||||
--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" \
|
||||
--stringparam wrap-install "$WRAP_INSTALL" \
|
||||
--stringparam hostname "$HOSTNAME" \
|
||||
--stringparam interface "$INTERFACE" \
|
||||
--stringparam ip "$IP_ADDR" \
|
||||
--stringparam gateway "$GATEWAY" \
|
||||
--stringparam prefix "$PREFIX" \
|
||||
--stringparam broadcast "$BROADCAST" \
|
||||
--stringparam domain "$DOMAIN" \
|
||||
--stringparam nameserver1 "$DNS1" \
|
||||
--stringparam nameserver2 "$DNS2" \
|
||||
--output ./${PROGNAME}-commands/ \
|
||||
$XSL \
|
||||
$BOOK/index.xml >> $LOGDIR/$LOG 2>&1
|
||||
;;
|
||||
*) echo -n " ${L_arrow}${PROGNAME}${R_arrow} book invalid, terminate build... "
|
||||
|
@ -224,19 +224,19 @@ create_package_list() { #
|
|||
$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
|
||||
;;
|
||||
*)
|
||||
|
|
|
@ -150,35 +150,35 @@ create_urls() { #
|
|||
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"
|
||||
;;
|
||||
|
|
Reference in a new issue