r3806 - jhalfs/trunk/BLFS/xsl

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Wed Sep 24 03:10:53 PDT 2014


Author: pierre
Date: Wed Sep 24 03:10:53 2014
New Revision: 3806

Log:
When a package installs bootscripts, the UNPACKDIR variable is used for
unpacking the booscripts. Then, when we want to remove the build directory
of the package, the UNPACKDIR is set to something else and the build
directory is not removed.

Modified:
   jhalfs/trunk/BLFS/xsl/scripts.xsl

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==============================================================================
--- jhalfs/trunk/BLFS/xsl/scripts.xsl	Tue Sep 23 13:18:44 2014	(r3805)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl	Wed Sep 24 03:10:53 2014	(r3806)
@@ -398,17 +398,17 @@
 fi
 
 if [[ -e unpacked ]] ; then
-  UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
-  if ! [[ -d $UNPACKDIR ]]; then
+  BOOTUNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
+  if ! [[ -d $BOOTUNPACKDIR ]]; then
     rm unpacked
     tar -xvf $BOOTPACKG > unpacked
-    UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
+    BOOTUNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
   fi
 else
   tar -xvf $BOOTPACKG > unpacked
-  UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
+  BOOTUNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
 fi
-cd $UNPACKDIR
+cd $BOOTUNPACKDIR
 </xsl:text>
     </xsl:if>
     <xsl:apply-templates select='.'/>


More information about the alfs-log mailing list