[alfs-log] r3970 - jhalfs/trunk/common/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Thu Jun 29 07:10:30 PDT 2017


Author: pierre
Date: Thu Jun 29 07:10:30 2017
New Revision: 3970

Log:
Quote bash variables in arguments to --stringparam for xsltproc

Modified:
   jhalfs/trunk/common/libs/func_book_parser
   jhalfs/trunk/common/libs/func_download_pkgs

Modified: jhalfs/trunk/common/libs/func_book_parser
==============================================================================
--- jhalfs/trunk/common/libs/func_book_parser	Thu Jun 29 02:59:05 2017	(r3969)
+++ jhalfs/trunk/common/libs/func_book_parser	Thu Jun 29 07:10:30 2017	(r3970)
@@ -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,29 +164,29 @@
         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 @@
                  $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/trunk/common/libs/func_download_pkgs
==============================================================================
--- jhalfs/trunk/common/libs/func_download_pkgs	Thu Jun 29 02:59:05 2017	(r3969)
+++ jhalfs/trunk/common/libs/func_download_pkgs	Thu Jun 29 07:10:30 2017	(r3970)
@@ -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"
       ;;


More information about the alfs-log mailing list