Changeset 00f4966 for BLFS

Timestamp:

08/13/2006 06:24:16 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

2fedf49

Parents:

d0d9e90

Message:

Merged r2936:2940 from trunk

Location:

BLFS

Files:

• blfs-parser.sh (modified) (2 diffs)
• libs/book.xsl (modified) (1 diff)
• libs/func_parser (modified) (2 diffs)
• libs/scripts.xsl (modified) (2 diffs)
• packages.sh (deleted)
• update_book.sh (added)

BLFS/blfs-parser.sh

@@ -11 +11 @@
 
 # Grab and name the command line options
-    optTARGET=$1
-optDEPENDENCY=$2
+    optTARGET=$1  # Package target
+optDEPENDENCY=$2  # Dependencies level, 1/2/3
+         SUDO=$3  # Build as user (y) or as root (n)
+
+[[ -z $SUDO ]] && SUDO=y
 
 
@@ -114 +117 @@
 generate_TARGET_xml
 generate_target_book
-create_build_scripts
+create_build_scripts "${SUDO}"

BLFS/libs/book.xsl

@@ -7 +7 @@
 <!-- $Id$ -->
 
-  <!-- NOTE: the base dir (blfs-xml) must be changed to FAKEDIR on the
-  final version and set it to the proper dir via a sed in ./blfs -->
+  <!-- NOTE: the base dir (blfs-xml) is set to the proper dir
+  via a sed in ./blfs -->
   <xsl:import href="../blfs-xml/stylesheets/blfs-chunked.xsl"/>
 

BLFS/libs/func_parser

@@ -127 +127 @@
 : <<inline_doc
     function:   Create shell scripts of the requested TARGET.
-    input vars: nothing
+    input vars: $1 use sudo n/y
     externals:  TARGET
     modifies:   nothing
@@ -141 +141 @@
   echo -en "\n\tGenerating the build scripts ..."
   xsltproc --xinclude --nonet \
+           --stringparam sudo $SUDO \
            -o ./scripts/ ../libs/scripts.xsl \
            $TARGET-index.xml >> xsltproc.log 2>&1

BLFS/libs/scripts.xsl

@@ -9 +9 @@
 
 <!-- XSLT stylesheet to create shell scripts from "linear build" BLFS books. -->
+
+  <!-- Build as user (y) or as root (n)? -->
+  <xsl:param name="sudo" select="y"/>
 
   <xsl:template match="/">
@@ -345 +348 @@
   <xsl:template match="screen">
     <xsl:if test="child::* = userinput and not(@role = 'nodump')">
-      <xsl:if test="@role = 'root'">
+      <xsl:if test="@role = 'root' and $sudo = 'y'">
         <xsl:text>sudo sh -c "</xsl:text>
       </xsl:if>
       <xsl:apply-templates select="userinput"/>
-      <xsl:if test="@role = 'root'">
+      <xsl:if test="@role = 'root' and $sudo = 'y'">
         <xsl:text>"</xsl:text>
       </xsl:if>