[gentoo-dev] [PATCH v2] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME

[gentoo-dev] [PATCH v2] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME

[Volkmar W. Pogatzki]

Avoids the need for setting JAVA_LAUNCHER_FILENAME="${PN}" if SLOT is 0.

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
---
 eclass/java-pkg-simple.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 929ce68c6c07..a57fae02ffd7 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -161,7 +161,11 @@ fi
 # If ${JAVA_MAIN_CLASS} is set, we will create a launcher to
 # execute the jar, and ${JAVA_LAUNCHER_FILENAME} will be the
 # name of the script.
+if [[ ${SLOT} = 0 ]]; then
+: "${JAVA_LAUNCHER_FILENAME:=${PN}}"
+else
 : "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}"
+fi
 
 # @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS
 # @DEFAULT_UNSET
-- 
2.39.3

Re: [gentoo-dev] [PATCH v2] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

>>>>> On Mon, 29 May 2023, Volkmar W Pogatzki wrote:

> +if [[ ${SLOT} = 0 ]]; then
> +: "${JAVA_LAUNCHER_FILENAME:=${PN}}"
> +else
>  : "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}"
> +fi

Please indent the lines in the then and else blocks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]