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

[Patrice Clement]

commit:     f22d44731c030ece8de4f956c247da9f47f61982
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 13:57:49 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=f22d4473

sys-cluster/spark-bin: set SPARK_HOME correctly.

The find-spark-home script is now useless. Do not install it.

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    | 21 +++++++++++++++------
 sys-cluster/spark-bin/spark-bin-3.0.1-r1.ebuild | 21 +++++++++++++++------
 2 files changed, 30 insertions(+), 12 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 ab322d5079a..e74d8346bae 100644
--- a/sys-cluster/spark-bin/spark-bin-2.4.7.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-2.4.7.ebuild
@@ -30,13 +30,22 @@ src_install() {
        dodir usr/lib/spark-${SLOT}
        into usr/lib/spark-${SLOT}
 
-       dobin bin/beeline \
-               bin/find-spark-home \
-               bin/pyspark \
-               bin/spark-class \
-               bin/spark-shell \
-               bin/spark-sql \
+       local SPARK_SCRIPTS=(
+               bin/beeline
+               bin/pyspark
+               bin/spark-class
+               bin/spark-shell
+               bin/spark-sql
                bin/spark-submit
+       )
+
+       local s
+       for s in "${SPARK_SCRIPTS[@]}"; do
+               ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in 
$(basename ${s}) script ..."
+               sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}"
+               eend $?
+               dobin "${s}"
+       done
 
        insinto usr/lib/spark-${SLOT}/bin
        doins bin/load-spark-env.sh

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 d3c6e1123fb..d5a88738063 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,13 +30,22 @@ src_install() {
        dodir usr/lib/spark-${SLOT}
        into usr/lib/spark-${SLOT}
 
-       dobin bin/beeline \
-               bin/find-spark-home \
-               bin/pyspark \
-               bin/spark-class \
-               bin/spark-shell \
-               bin/spark-sql \
+       local SPARK_SCRIPTS=(
+               bin/beeline
+               bin/pyspark
+               bin/spark-class
+               bin/spark-shell
+               bin/spark-sql
                bin/spark-submit
+       )
+
+       local s
+       for s in "${SPARK_SCRIPTS[@]}"; do
+               ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in 
$(basename ${s}) script ..."
+               sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}"
+               eend $?
+               dobin "${s}"
+       done
 
        insinto usr/lib/spark-${SLOT}/bin
        doins bin/load-spark-env.sh