diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-05-20 02:21:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-05-20 02:21:17 +0000 |
| commit | 270470aa79369d399cb4e1af3dd233e38f8d1a7b (patch) | |
| tree | d41c2fcc8f08e8cac3281c4beaff9184893670fe /eclass/eutils.eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-270470aa79369d399cb4e1af3dd233e38f8d1a7b.tar.gz gentoo-2-270470aa79369d399cb4e1af3dd233e38f8d1a7b.tar.bz2 gentoo-2-270470aa79369d399cb4e1af3dd233e38f8d1a7b.zip | |
drop unnecessary output padding in unpack_makeself #320313
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 8a260ca3140e..c2b407a1c0bc 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.343 2010/05/11 20:08:02 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.344 2010/05/20 02:21:17 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1341,15 +1341,15 @@ unpack_makeself() { ;; 2.1.1) skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) - let skip="skip + 1" + (( skip++ )) ;; 2.1.2) skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) - let skip="skip + 1" + (( skip++ )) ;; 2.1.3) skip=`grep -a ^offset= "${src}" | awk '{print $3}'` - let skip="skip + 1" + (( skip++ )) ;; 2.1.4|2.1.5) skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) @@ -1368,7 +1368,7 @@ unpack_makeself() { fi case ${exe} in tail) exe="tail -n +${skip} '${src}'";; - dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; + dd) exe="dd ibs=${skip} skip=1 if='${src}'";; *) die "makeself cant handle exe '${exe}'" esac |