diff options
| author | Michał Górny <mgorny@gentoo.org> | 2016-05-14 11:11:12 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-05-14 11:54:20 +0200 |
| commit | 9a32b4351ddbd4ed1da939feddb8925ab18c1fb7 (patch) | |
| tree | 09b12feb64154b8464b4650f472150c06da064d3 /eclass | |
| parent | 150e4360638b492a315002a6fc155c864535dea1 (diff) | |
| download | gentoo-9a32b4351ddbd4ed1da939feddb8925ab18c1fb7.tar.gz gentoo-9a32b4351ddbd4ed1da939feddb8925ab18c1fb7.tar.xz | |
java-utils-2.eclass: Use insinto & insopts instead of vars, #566480
Replace INSDESTTREE and INSOPTIONS internal variable references with
correct calls to insinto & insopts, using a subshell to scope them.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 65e7197ef42..3b58a25dbb3 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -348,8 +348,10 @@ java-pkg_dojar() { #but first check class version when in strict mode. is-java-strict && java-pkg_verify-classes "${jar}" - INSDESTTREE="${JAVA_PKG_JARDEST}" \ - doins "${jar}" || die "failed to install ${jar}" + ( + insinto "${JAVA_PKG_JARDEST}" + doins "${jar}" + ) || die "failed to install ${jar}" java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" # make a symlink to the original jar if it's symlink @@ -493,9 +495,11 @@ java-pkg_doso() { if [[ -e "${lib}" ]] ; then # install if it isn't a symlink if [[ ! -L "${lib}" ]] ; then - INSDESTTREE="${JAVA_PKG_LIBDEST}" \ - INSOPTIONS="-m0755" \ - doins "${lib}" || die "failed to install ${lib}" + ( + insinto "${JAVA_PKG_LIBDEST}" + insopts -m0755 + doins "${lib}" + ) || die "failed to install ${lib}" java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" # otherwise make a symlink to the symlink's origin @@ -724,8 +728,10 @@ java-pkg_dosrc() { done # Install the zip - INSDESTTREE=${JAVA_PKG_SOURCESPATH} \ - doins ${zip_path} || die "Failed to install source" + ( + insinto "${JAVA_PKG_SOURCESPATH}" + doins ${zip_path} + ) || die "Failed to install source" JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" @@ -864,9 +870,11 @@ java-pkg_dowar() { fi # Install those files like you mean it - INSOPTIONS="-m 0644" \ - INSDESTTREE=${JAVA_PKG_WARDEST} \ + ( + insopts -m0644 + insinto "${JAVA_PKG_WARDEST}" doins ${warpath} + ) done } |