[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     2815d61ee148bc442b450c017a9c9e7ad0a34c19
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 19:44:28 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 07:35:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2815d61e

unpacker.eclass: Replace unnecessary eval with array

Replace the eval used to attempt to construct whitespace-path-safe
utility calls with much simpler bash arrays.

 eclass/unpacker.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 8c55cc5319b..6e996120646 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: unpacker.eclass
@@ -218,30 +218,30 @@ unpack_makeself() {
                debug-print "Detected Makeself version ${ver} ... using ${skip} 
as offset"
        fi
        case ${exe} in
-               tail)   exe="tail -n +${skip} '${src}'";;
-               dd)             exe="dd ibs=${skip} skip=1 if='${src}'";;
+               tail)   exe=( tail -n +${skip} "${src}" );;
+               dd)             exe=( dd ibs=${skip} skip=1 if="${src}" );;
                *)              die "makeself cant handle exe '${exe}'"
        esac
 
        # lets grab the first few bytes of the file to figure out what kind of 
archive it is
        local filetype tmpfile="${T}/${FUNCNAME}"
-       eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
+       "${exe[@]}" 2>/dev/null | head -c 512 > "${tmpfile}"
        filetype=$(file -b "${tmpfile}") || die
        case ${filetype} in
                *tar\ archive*)
-                       eval ${exe} | tar --no-same-owner -xf -
+                       "${exe[@]}" | tar --no-same-owner -xf -
                        ;;
                bzip2*)
-                       eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
+                       "${exe[@]}" | bzip2 -dc | tar --no-same-owner -xf -
                        ;;
                gzip*)
-                       eval ${exe} | tar --no-same-owner -xzf -
+                       "${exe[@]}" | tar --no-same-owner -xzf -
                        ;;
                compress*)
-                       eval ${exe} | gunzip | tar --no-same-owner -xf -
+                       "${exe[@]}" | gunzip | tar --no-same-owner -xf -
                        ;;
                XZ*)
-                       eval ${exe} | unxz | tar --no-same-owner -xf -
+                       "${exe[@]}" | unxz | tar --no-same-owner -xf -
                        ;;
                *)
                        eerror "Unknown filetype \"${filetype}\" ?"