From 5f4982dc54498ad737276bbe4967b571ca8b1b79 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Mon, 4 Dec 2006 12:49:35 +0000
Subject: [PATCH] Simplified sha-bang addition. We are creating the /bin/bash
 symlink before entering to the chroot jail.

---
 CLFS/clfs.xsl   | 16 +++++-----------
 CLFS2/clfs2.xsl |  3 ++-
 CLFS3/clfs3.xsl |  3 ++-
 HLFS/hlfs.xsl   | 20 ++++++--------------
 LFS/lfs.xsl     | 20 ++++++--------------
 5 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/CLFS/clfs.xsl b/CLFS/clfs.xsl
index 49cc763..6bafb48 100644
--- a/CLFS/clfs.xsl
+++ b/CLFS/clfs.xsl
@@ -86,17 +86,11 @@
           </xsl:variable>
             <!-- Creating dirs and files -->
           <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-            <xsl:choose>
-              <xsl:when test="../@id='chapter-chroot'">
-                <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-              </xsl:when>
-              <xsl:when test="@id='ch-system-stripping'">
-                <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>#!/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
+            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
+            <xsl:if test="not(@id='ch-system-stripping')">
+              <xsl:text>set -e</xsl:text>
+            </xsl:if>
+            <xsl:text>&#xA;</xsl:text>
             <xsl:if test="sect2[@role='installation']">
               <xsl:text>cd $PKGDIR&#xA;</xsl:text>
               <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">
diff --git a/CLFS2/clfs2.xsl b/CLFS2/clfs2.xsl
index b5f1b38..76fa0f0 100644
--- a/CLFS2/clfs2.xsl
+++ b/CLFS2/clfs2.xsl
@@ -68,8 +68,9 @@
           <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
             <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
             <xsl:if test="not(@id='ch-system-stripping')">
-              <xsl:text>set -e&#xA;&#xA;</xsl:text>
+              <xsl:text>set -e&#xA;</xsl:text>
             </xsl:if>
+            <xsl:text>&#xA;</xsl:text>
             <xsl:if test="sect2[@role='installation']">
               <xsl:text>cd $PKGDIR&#xA;</xsl:text>
               <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">
diff --git a/CLFS3/clfs3.xsl b/CLFS3/clfs3.xsl
index c7bbe5c..ebd4bea 100644
--- a/CLFS3/clfs3.xsl
+++ b/CLFS3/clfs3.xsl
@@ -68,8 +68,9 @@
           <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
             <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
             <xsl:if test="not(@id='ch-system-stripping')">
-              <xsl:text>set -e&#xA;&#xA;</xsl:text>
+              <xsl:text>set -e&#xA;</xsl:text>
             </xsl:if>
+            <xsl:text>&#xA;</xsl:text>
             <xsl:if test="sect2[@role='installation']">
               <xsl:text>cd $PKGDIR&#xA;</xsl:text>
             </xsl:if>
diff --git a/HLFS/hlfs.xsl b/HLFS/hlfs.xsl
index a15410d..b509706 100644
--- a/HLFS/hlfs.xsl
+++ b/HLFS/hlfs.xsl
@@ -83,20 +83,12 @@
       </xsl:variable>
         <!-- Creating dirs and files -->
       <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-        <xsl:choose>
-          <xsl:when test="@id='ch-system-changingowner' or
-                    @id='ch-system-creatingdirs' or
-                    @id='ch-system-createfiles'">
-            <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-          </xsl:when>
-          <xsl:when test="@id='ch-tools-stripping' or
-                    @id='ch-system-strippingagain'">
-            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>#!/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
+        <xsl:if test="not(@id='ch-tools-stripping') and
+                      not(@id='ch-system-strippingagain')">
+          <xsl:text>set -e&#xA;</xsl:text>
+        </xsl:if>
+        <xsl:text>&#xA;</xsl:text>
         <xsl:if test="(sect2[@role='installation'] and
                            not(@id='bootable-kernel'))">
           <xsl:text>cd $PKGDIR&#xA;</xsl:text>
diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 21a1277..b6d562d 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -74,20 +74,12 @@
       </xsl:variable>
         <!-- Creating dirs and files -->
       <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-        <xsl:choose>
-          <xsl:when test="@id='ch-system-changingowner' or
-                    @id='ch-system-creatingdirs' or
-                    @id='ch-system-createfiles'">
-            <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-          </xsl:when>
-          <xsl:when test="@id='ch-tools-stripping' or
-                    @id='ch-system-strippingagain'">
-            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>#!/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
+        <xsl:if test="not(@id='ch-tools-stripping') and
+                      not(@id='ch-system-strippingagain')">
+          <xsl:text>set -e&#xA;</xsl:text>
+        </xsl:if>
+        <xsl:text>&#xA;</xsl:text>
         <xsl:if test="sect2[@role='installation']">
           <xsl:text>cd $PKGDIR&#xA;</xsl:text>
           <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">