diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2003-07-22 18:42:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2003-07-22 18:42:59 +0000 |
| commit | a5aa771e97bfcc076789ae3a38e364e375e797e2 (patch) | |
| tree | c636e52afdf277a06ca5ef176983ac333e954398 /eclass/eutils.eclass | |
| parent | unmasking nasm on amd64 (diff) | |
| download | gentoo-2-a5aa771e97bfcc076789ae3a38e364e375e797e2.tar.gz gentoo-2-a5aa771e97bfcc076789ae3a38e364e375e797e2.tar.bz2 gentoo-2-a5aa771e97bfcc076789ae3a38e364e375e797e2.zip | |
support makeself archives that arent gzipped
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index f5f47db500e2..edcd8933703c 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.45 2003/07/18 20:43:00 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.46 2003/07/22 18:42:59 vapier Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -873,6 +873,10 @@ unpack_makeself() { # we do this because otherwise a failure in gzip will cause 0 bytes to be sent # to tar which will make tar not extract anything and exit with 0 - local out="`tail +${skip} ${src} | gzip -cd | tar -x --no-same-owner -v -f -`" - [ -z "${out}" ] && die "failure unpacking makeself ${shrtsrc} ('${ver}' +${skip})" + local out="`(tail +${skip} ${src} | gzip -cd | tar -x --no-same-owner -f -) 2>&1`" + if [ ! -z "${out}" ] ; then + # maybe it isnt gzipped ... they usually are, but not always ... + tail +${skip} ${src} | tar -x --no-same-owner -f - \ + || die "failure unpacking makeself ${shrtsrc} ('${ver}' +${skip})" + fi } |