diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2018-07-16 21:31:06 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2018-07-16 21:31:06 +0000 |
commit | 616346c780c09ba7c9be997a9d933c28ec55b53b (patch) | |
tree | 57ef8f4ed243e052525f9dbedb0f1ffc87dbb4c7 | |
parent | 2018-07-16 20:44:27 UTC (diff) | |
parent | eutils.eclass: make_wrapper, fix 'cd' error handling (diff) | |
download | gentoo-616346c780c09ba7c9be997a9d933c28ec55b53b.tar.gz gentoo-616346c780c09ba7c9be997a9d933c28ec55b53b.tar.bz2 gentoo-616346c780c09ba7c9be997a9d933c28ec55b53b.zip |
Merge updates from master
-rw-r--r-- | eclass/eutils.eclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 81621df78e63..9b4767e1874a 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -148,7 +148,6 @@ make_wrapper() { ( echo '#!/bin/sh' - [[ -n ${chdir} ]] && printf 'cd "%s"\n' "${EPREFIX}${chdir}" if [[ -n ${libdir} ]] ; then local var if [[ ${CHOST} == *-darwin* ]] ; then @@ -164,6 +163,7 @@ make_wrapper() { fi EOF fi + [[ -n ${chdir} ]] && printf 'cd "%s" &&\n' "${EPREFIX}${chdir}" # We don't want to quote ${bin} so that people can pass complex # things as ${bin} ... "./someprog --args" printf 'exec %s "$@"\n' "${bin/#\//${EPREFIX}/}" |