1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

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

    From Volkmar W. Pogatzki@21:1/5 to All on Mon May 29 09:30:01 2023
    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

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Ulrich Mueller@21:1/5 to All on Mon May 29 12:00:01 2023
    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.

    -----BEGIN PGP SIGNATURE-----

    iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmR0dkcPHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4u2v8H/RJni3onjNY1Xuc6hM8J072KBqjK2YQ+R5jA Hkbzn84KjrHTIWV7ncXR/IjTaN3YWhiGKrMHPKWS1Z0SroLj+CFPQApuS16f7U+2 XBlaUA8MdgcufxnUfcMSTfO27KqSUKrrM2bwlef0GtqEfIH2Nat17UXSlZI/vh1W H8ZIUGrCRNha1UuvGQLr23TUeYvTAAtgGvY0CKMymqTHznsOWdhcMR3Pv8J3mRs3 1l32kFBSvEfkPtIrXn3oS7+2TXFOaRPuC4g6JSdbfRTqSX2wcultO/EhufRJEs8R nr11oB08LhiQYp2ZvwkV+Z2HRzM2cbrnRp/vEnhbQ9cKCCqj/6w=
    =GKDE
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)