[gentoo-commits] repo/gentoo:master commit in: sys-cluster/spark-bin/

[Patrice Clement]

commit:     7b6a1854a80887fd4a0497d1fe48bfe533ad6682
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 14:01:50 2020 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 14:06:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6a1854

sys-cluster/spark-bin: add load-spark-env script to SPARK_SCRIPTS.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 sys-cluster/spark-bin/spark-bin-2.4.7.ebuild    | 6 +++---
 sys-cluster/spark-bin/spark-bin-3.0.1-r1.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-cluster/spark-bin/spark-bin-2.4.7.ebuild 
b/sys-cluster/spark-bin/spark-bin-2.4.7.ebuild
index e74d8346bae..3c1fcfa0a95 100644
--- a/sys-cluster/spark-bin/spark-bin-2.4.7.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-2.4.7.ebuild
@@ -30,8 +30,11 @@ src_install() {
        dodir usr/lib/spark-${SLOT}
        into usr/lib/spark-${SLOT}
 
+       mv bin/load-spark-env.sh bin/load-spark-env || die
+
        local SPARK_SCRIPTS=(
                bin/beeline
+               bin/load-spark-env
                bin/pyspark
                bin/spark-class
                bin/spark-shell
@@ -47,9 +50,6 @@ src_install() {
                dobin "${s}"
        done
 
-       insinto usr/lib/spark-${SLOT}/bin
-       doins bin/load-spark-env.sh
-
        insinto usr/lib/spark-${SLOT}
        doins -r conf
        doins -r jars

diff --git a/sys-cluster/spark-bin/spark-bin-3.0.1-r1.ebuild 
b/sys-cluster/spark-bin/spark-bin-3.0.1-r1.ebuild
index d5a88738063..25c01561919 100644
--- a/sys-cluster/spark-bin/spark-bin-3.0.1-r1.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-3.0.1-r1.ebuild
@@ -30,8 +30,11 @@ src_install() {
        dodir usr/lib/spark-${SLOT}
        into usr/lib/spark-${SLOT}
 
+       mv bin/load-spark-env.sh bin/load-spark-env || die
+
        local SPARK_SCRIPTS=(
                bin/beeline
+               bin/load-spark-env
                bin/pyspark
                bin/spark-class
                bin/spark-shell
@@ -47,9 +50,6 @@ src_install() {
                dobin "${s}"
        done
 
-       insinto usr/lib/spark-${SLOT}/bin
-       doins bin/load-spark-env.sh
-
        insinto usr/lib/spark-${SLOT}
        doins -r conf
        doins -r jars