From dd4d44fe38d66484d15adfa4ca7ac806c8982ebc Mon Sep 17 00:00:00 2001
From: Hiroshi Miura <miurahr@linux.com>
Date: Sun, 31 Jan 2021 17:40:30 +0900
Subject: [PATCH 1/3] Linux: load openjfx when exist

When java is 11 and openjfx is specified by OPENJFX_CLASSPATH
automatically load openjfx as module.
This help plugin which use javafx.swing GUI component working.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
---
 release/linux-specific/OmegaT | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/release/linux-specific/OmegaT b/release/linux-specific/OmegaT
index 474476ea3c..39b5c2f6cf 100644
--- a/release/linux-specific/OmegaT
+++ b/release/linux-specific/OmegaT
@@ -7,4 +7,9 @@ JAVA="java"
 BUNDLED_JAVA="${REALOMEGATPATH}/jre/bin/java"
 [ -f "${BUNDLED_JAVA}" ] && JAVA="${BUNDLED_JAVA}"
 
-"${JAVA}" -jar -Xmx1024M "${REALOMEGATPATH}/@JAR_SUBST@" "$@"
+version=$("$JAVA" -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F '.' '{print $1}')
+if [[ "${OPENJFX_CLASSPATH}" ]] && [[ "${version}" == "11" ]]; then
+  "${JAVA}" --module-path ${OPENJFX_CLASSPATH} --add-modules=javafx.base,javafx.controls,javafx.swing,javafx.web -jar -Xmx1024M "${REALOMEGATPATH}/@JAR_SUBST@" "$@"
+else
+  "${JAVA}" -jar -Xmx1024M "${REALOMEGATPATH}/@JAR_SUBST@" "$@"
+fi

From 5ebe2924bf2b9c1f3a6abcbdeabc023999fc6128 Mon Sep 17 00:00:00 2001
From: Aaron Madlon-Kay <aaron@madlon-kay.com>
Date: Fri, 21 May 2021 21:31:51 +0900
Subject: [PATCH 2/3] Cleanup

---
 release/linux-specific/OmegaT | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/release/linux-specific/OmegaT b/release/linux-specific/OmegaT
index 39b5c2f6cf..48c4c00c8a 100644
--- a/release/linux-specific/OmegaT
+++ b/release/linux-specific/OmegaT
@@ -1,15 +1,20 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # readlink follows any symbolic links to get the real file
-REALOMEGATPATH=`dirname "$(readlink -nf $0)"`
+REAL_OMEGAT_PATH=$(dirname "$(readlink -nf "$0")")
 
 JAVA="java"
-BUNDLED_JAVA="${REALOMEGATPATH}/jre/bin/java"
-[ -f "${BUNDLED_JAVA}" ] && JAVA="${BUNDLED_JAVA}"
-
-version=$("$JAVA" -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F '.' '{print $1}')
-if [[ "${OPENJFX_CLASSPATH}" ]] && [[ "${version}" == "11" ]]; then
-  "${JAVA}" --module-path ${OPENJFX_CLASSPATH} --add-modules=javafx.base,javafx.controls,javafx.swing,javafx.web -jar -Xmx1024M "${REALOMEGATPATH}/@JAR_SUBST@" "$@"
-else
-  "${JAVA}" -jar -Xmx1024M "${REALOMEGATPATH}/@JAR_SUBST@" "$@"
+BUNDLED_JAVA="$REAL_OMEGAT_PATH/jre/bin/java"
+[ -f "$BUNDLED_JAVA" ] && JAVA="$BUNDLED_JAVA"
+
+JAVA_VERSION=$("$JAVA" -version 2>&1 | sed -nE 's/.*version "([0-9_.]+)".*/\1/p')
+
+OPENJFX_OPTS=
+if [ -n "$OPENJFX_CLASSPATH" ] && [[ "$JAVA_VERSION" =~ ^11\. ]]; then
+    OPENJFX_OPTS=(
+        "--module-path" "$OPENJFX_CLASSPATH"
+        "--add-modules=javafx.base,javafx.controls,javafx.swing,javafx.web"
+    )
 fi
+
+"$JAVA" "${OPENJFX_OPTS[@]}" -jar -Xmx1024M "$REAL_OMEGAT_PATH/@JAR_SUBST@" "$@"

From 0f8b81df6cc2117dc097a7f97398140a5a539216 Mon Sep 17 00:00:00 2001
From: Aaron Madlon-Kay <aaron@madlon-kay.com>
Date: Fri, 21 May 2021 21:33:18 +0900
Subject: [PATCH 3/3] Use consistent arg style

---
 release/linux-specific/OmegaT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/linux-specific/OmegaT b/release/linux-specific/OmegaT
index 48c4c00c8a..3caa0af314 100644
--- a/release/linux-specific/OmegaT
+++ b/release/linux-specific/OmegaT
@@ -13,7 +13,7 @@ OPENJFX_OPTS=
 if [ -n "$OPENJFX_CLASSPATH" ] && [[ "$JAVA_VERSION" =~ ^11\. ]]; then
     OPENJFX_OPTS=(
         "--module-path" "$OPENJFX_CLASSPATH"
-        "--add-modules=javafx.base,javafx.controls,javafx.swing,javafx.web"
+        "--add-modules" "javafx.base,javafx.controls,javafx.swing,javafx.web"
     )
 fi