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

Quote bash variables in arguments to --stringparam for xsltproc

Browse source
This commit is contained in:
Pierre Labastie 2017-06-29 14:10:30 +00:00
parent 6990d80390
commit a4acb1236b
2 changed files with 82 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
common/libs/func_book_parser
View file

@ -95,46 +95,46 @@ extract_commands() { #
case ${PROGNAME} in case ${PROGNAME} in
clfs) clfs)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... " echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam method $METHOD \ --stringparam method "$METHOD" \
--stringparam testsuite $TEST \ --stringparam testsuite "$TEST" \
--stringparam bomb-testsuite $BOMB_TEST \ --stringparam bomb-testsuite "$BOMB_TEST" \
--stringparam vim-lang $VIMLANG \ --stringparam vim-lang "$VIMLANG" \
--stringparam timezone $TIMEZONE \ --stringparam timezone "$TIMEZONE" \
--stringparam page $PAGE \ --stringparam page "$PAGE" \
--stringparam lang $LANG \ --stringparam lang "$LANG" \
--stringparam sparc $SPARC64_PROC \ --stringparam sparc "$SPARC64_PROC" \
--stringparam x86 $TARGET \ --stringparam x86 "$TARGET" \
--stringparam mips $TARGET \ --stringparam mips "$TARGET" \
-o ./${PROGNAME}-commands/ \ -o ./${PROGNAME}-commands/ \
$XSL \ $XSL \
$BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
;; ;;
clfs2) clfs2)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... " echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam vim-lang $VIMLANG \ --stringparam vim-lang "$VIMLANG" \
--stringparam timezone $TIMEZONE \ --stringparam timezone "$TIMEZONE" \
--stringparam page $PAGE \ --stringparam page "$PAGE" \
--stringparam lang $LANG \ --stringparam lang "$LANG" \
--output ./${PROGNAME}-commands/ \ --output ./${PROGNAME}-commands/ \
$XSL \ $XSL \
$BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
;; ;;
clfs3) clfs3)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... " echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam endian x$ENDIAN \ --stringparam endian x$ENDIAN \
--stringparam timezone $TIMEZONE \ --stringparam timezone "$TIMEZONE" \
--stringparam page $PAGE \ --stringparam page "$PAGE" \
--stringparam lang $LANG \ --stringparam lang "$LANG" \
--output ./${PROGNAME}-commands/ \ --output ./${PROGNAME}-commands/ \
$XSL \ $XSL \
$BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
;; ;;
@ -164,29 +164,29 @@ extract_commands() { #
fi fi
popd > /dev/null popd > /dev/null
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam revision $INITSYS \ --stringparam revision "$INITSYS" \
--stringparam testsuite $TEST \ --stringparam testsuite "$TEST" \
--stringparam bomb-testsuite $BOMB_TEST \ --stringparam bomb-testsuite "$BOMB_TEST" \
--stringparam vim-lang $VIMLANG \ --stringparam vim-lang "$VIMLANG" \
--stringparam full-locale $FULL_LOCALE \ --stringparam full-locale "$FULL_LOCALE" \
--stringparam timezone $TIMEZONE \ --stringparam timezone "$TIMEZONE" \
--stringparam page $PAGE \ --stringparam page "$PAGE" \
--stringparam lang $LANG \ --stringparam lang "$LANG" \
--stringparam pkgmngt $PKGMNGT \ --stringparam pkgmngt "$PKGMNGT" \
--stringparam wrap-install $WRAP_INSTALL \ --stringparam wrap-install "$WRAP_INSTALL" \
--stringparam hostname $HOSTNAME \ --stringparam hostname "$HOSTNAME" \
--stringparam interface $INTERFACE \ --stringparam interface "$INTERFACE" \
--stringparam ip $IP_ADDR \ --stringparam ip "$IP_ADDR" \
--stringparam gateway $GATEWAY \ --stringparam gateway "$GATEWAY" \
--stringparam prefix $PREFIX \ --stringparam prefix "$PREFIX" \
--stringparam broadcast $BROADCAST \ --stringparam broadcast "$BROADCAST" \
--stringparam domain $DOMAIN \ --stringparam domain "$DOMAIN" \
--stringparam nameserver1 $DNS1 \ --stringparam nameserver1 "$DNS1" \
--stringparam nameserver2 $DNS2 \ --stringparam nameserver2 "$DNS2" \
--output ./${PROGNAME}-commands/ \ --output ./${PROGNAME}-commands/ \
$XSL \ $XSL \
$BOOK/index.xml >> $LOGDIR/$LOG 2>&1 $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
;; ;;
*) echo -n " ${L_arrow}${PROGNAME}${R_arrow} book invalid, terminate build... " *) 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 $BOOK/BOOK/materials/${ARCH}-chapter.xml >>$LOGDIR/$LOG 2>&1
;; ;;
hlfs) hlfs)
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam model $MODEL \ --stringparam model "$MODEL" \
--stringparam kernel $KERNEL \ --stringparam kernel "$KERNEL" \
--output pkg_tarball_list \ --output pkg_tarball_list \
packages.xsl \ packages.xsl \
$BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1 $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
;; ;;
lfs) lfs)
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam pkgmngt $PKGMNGT \ --stringparam pkgmngt "$PKGMNGT" \
--stringparam revision $INITSYS \ --stringparam revision "$INITSYS" \
--output pkg_tarball_list \ --output pkg_tarball_list \
packages.xsl \ packages.xsl \
$BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
;; ;;
*) *)

38
common/libs/func_download_pkgs
View file

@ -150,35 +150,35 @@ create_urls() { #
case ${PROGNAME} in case ${PROGNAME} in
clfs*) clfs*)
echo -n "Creating CLFS <${ARCH}> specific URLs file" echo -n "Creating CLFS <${ARCH}> specific URLs file"
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam server $SERVER \ --stringparam server "$SERVER" \
--stringparam family clfs \ --stringparam family clfs \
-o $BUILDDIR/sources/urls.lst \ -o $BUILDDIR/sources/urls.lst \
urls.xsl \ urls.xsl \
$BOOK/BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1 $BOOK/BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK" echo " ...OK"
;; ;;
hlfs) hlfs)
echo -n "Creating HLFS <${MODEL}> + <${KERNEL}> specific URLs file" echo -n "Creating HLFS <${MODEL}> + <${KERNEL}> specific URLs file"
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam server $SERVER \ --stringparam server "$SERVER" \
--stringparam family lfs \ --stringparam family lfs \
--stringparam model $MODEL \ --stringparam model "$MODEL" \
--stringparam kernel $KERNEL \ --stringparam kernel "$KERNEL" \
-o $BUILDDIR/sources/urls.lst \ -o $BUILDDIR/sources/urls.lst \
urls.xsl \ urls.xsl \
$BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1 $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK" echo " ...OK"
;; ;;
lfs) lfs)
echo -n "Creating LFS specific URLs file" echo -n "Creating LFS specific URLs file"
xsltproc --nonet --xinclude \ xsltproc --nonet --xinclude \
--stringparam server $SERVER \ --stringparam server "$SERVER" \
--stringparam family lfs \ --stringparam family lfs \
--stringparam pkgmngt $PKGMNGT \ --stringparam pkgmngt "$PKGMNGT" \
--stringparam revision $INITSYS \ --stringparam revision "$INITSYS" \
--output ../sources/urls.lst \ --output ../sources/urls.lst \
urls.xsl \ urls.xsl \
$BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
echo " ...OK" echo " ...OK"
;; ;;