zeroday0619/MahiroOS-jhalfs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Failsafe tests to be sure that we are deleting an existing unpacked sources directory.

Browse source 
Thanks to Petr "Qaxi" Klíma for the report and patch.
This commit is contained in:
Manuel Canales Esparcia 2007-08-10 21:24:02 +00:00
parent 7c6c3556d2
commit 9695fa7cca
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BLFS/libs/scripts.xsl
View file

@ -155,7 +155,7 @@ cd xc&#xA;</xsl:text>
<xsl:text> <xsl:text>
if [[ -e unpacked ]] ; then if [[ -e unpacked ]] ; then
UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'` UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
rm -rf $UNPACKDIR [[ -n $UNPACKDIR ]] && [[ -d $UNPACKDIR ]] && rm -rf $UNPACKDIR
fi fi
tar -xvf $PACKAGE > unpacked tar -xvf $PACKAGE > unpacked
UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'` UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`

2
common/makefile-functions
View file

@ -64,6 +64,7 @@ endef
define remove_existing_dirs define remove_existing_dirs
@PKG_PATH=`ls -t $(SRCSDIR)/$(1) | head -n1` && \ @PKG_PATH=`ls -t $(SRCSDIR)/$(1) | head -n1` && \
ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \ ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
test -n "$$ROOT" -a -d $(SRCSDIR)/$$ROOT && \
rm -rf $(SRCSDIR)/$$ROOT && \ rm -rf $(SRCSDIR)/$$ROOT && \
rm -rf $(SRCSDIR)/$${ROOT%-*}-build rm -rf $(SRCSDIR)/$${ROOT%-*}-build
endef endef
@ -71,6 +72,7 @@ endef
define remove_existing_dirs2 define remove_existing_dirs2
@PKG_PATH=`ls -t $(SRC)/$(1) | head -n1` && \ @PKG_PATH=`ls -t $(SRC)/$(1) | head -n1` && \
ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \ ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
test -n "$$ROOT" -a -d $(SRC)/$$ROOT && \
rm -rf $(SRC)/$$ROOT && \ rm -rf $(SRC)/$$ROOT && \
rm -rf $(SRC)/$${ROOT%-*}-build rm -rf $(SRC)/$${ROOT%-*}-build
endef endef