From f079f8f2a83eb3535592eac0ddc90673a15ede44 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 24 Sep 2014 10:10:53 +0000 Subject: [PATCH] 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. --- BLFS/xsl/scripts.xsl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl index 5631164..e0eb94e 100644 --- a/BLFS/xsl/scripts.xsl +++ b/BLFS/xsl/scripts.xsl @@ -398,17 +398,17 @@ if [[ ! -f $BOOTPACKG ]] ; then 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