From 970f2dc6e05cc831471b5054b7c7c67059a1c06e Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Tue, 20 Mar 2012 17:12:26 +0000
Subject: [PATCH] Change script generation of root command: replace fragile
 construct sudo sh -c '<commands>' with slightly less fragile construct sudo
 sh << ROOT_EOF <commands with ` and \ escaped> ROOT_EOF Note: $ are not
 escaped, which is usually what is intended, but not always

---
 BLFS/xsl/scripts.xsl | 60 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index 3761bd3..be505dd 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -436,11 +436,11 @@ fi
       <xsl:choose>
         <xsl:when test="@role = 'root'">
           <xsl:if test="$sudo = 'y'">
-            <xsl:text>sudo sh -c '</xsl:text>
+            <xsl:text>sudo sh &lt;&lt; ROOT_EOF&#xA;</xsl:text>
           </xsl:if>
           <xsl:apply-templates select="userinput" mode="root"/>
           <xsl:if test="$sudo = 'y'">
-            <xsl:text>'</xsl:text>
+            <xsl:text>&#xA;ROOT_EOF</xsl:text>
           </xsl:if>
         </xsl:when>
         <xsl:otherwise>
@@ -507,10 +507,10 @@ popd</xsl:text>
   <xsl:template match="userinput" mode="root">
     <xsl:for-each select="child::node()">
       <xsl:choose>
-        <xsl:when test="self::text() and contains(string(),'make')">
-          <xsl:value-of select="substring-before(string(),'make')"/>
-          <xsl:text>make -j1</xsl:text>
-          <xsl:value-of select="substring-after(string(),'make')"/>
+        <xsl:when test="self::text()">
+          <xsl:call-template name="output-root">
+            <xsl:with-param name="out-string" select="string()"/>
+          </xsl:call-template>
         </xsl:when>
         <xsl:otherwise>
           <xsl:apply-templates select="self::node()"/>
@@ -519,18 +519,52 @@ popd</xsl:text>
     </xsl:for-each>
   </xsl:template>
 
-  <xsl:template match="replaceable">
-<!-- Not needed anymore
+  <xsl:template name="output-root">
+    <xsl:param name="out-string" select="''"/>
     <xsl:choose>
-      <xsl:when test="ancestor::sect1[@id='xorg7-server']">
-        <xsl:text>$SRC_DIR/MesaLib</xsl:text>
+      <xsl:when test="contains($out-string,'make')">
+        <xsl:call-template name="output-root">
+          <xsl:with-param name="out-string"
+                          select="substring-before($out-string,'make')"/>
+        </xsl:call-template>
+        <xsl:text>make -j1</xsl:text>
+        <xsl:call-template name="output-root">
+          <xsl:with-param name="out-string"
+                          select="substring-after($out-string,'make')"/>
+        </xsl:call-template>
       </xsl:when>
-      <xsl:otherwise> -->
+      <xsl:when test="contains($out-string,'`')">
+        <xsl:call-template name="output-root">
+          <xsl:with-param name="out-string"
+                          select="substring-before($out-string,'`')"/>
+        </xsl:call-template>
+        <xsl:text>\`</xsl:text>
+        <xsl:call-template name="output-root">
+          <xsl:with-param name="out-string"
+                          select="substring-after($out-string,'`')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="contains($out-string,'\')">
+        <xsl:call-template name="output-root">
+          <xsl:with-param name="out-string"
+                          select="substring-before($out-string,'\')"/>
+        </xsl:call-template>
+        <xsl:text>\\</xsl:text>
+        <xsl:call-template name="output-root">
+          <xsl:with-param name="out-string"
+                          select="substring-after($out-string,'\')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$out-string"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="replaceable">
         <xsl:text>**EDITME</xsl:text>
         <xsl:apply-templates/>
         <xsl:text>EDITME**</xsl:text>
-<!--      </xsl:otherwise>
-    </xsl:choose> -->
   </xsl:template>
 
 </xsl:stylesheet>