drop unnecessary output padding in unpack_makeself #320313

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 8a260ca3140e872111f745974e7285b765b1e3d0..c2b407a1c0bcd6f7a48ef043c07c1b012aca14cd 100644 (file)
--- 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