Use system JRE and change package structure

- Use system JRE instead of the bundled one. Change the source file.
- Use the directory structure in Java package guidelines.
- Use simpler scripts in /usr/bin
- Fixed some other minor mistakes

Suggested by Dmytro Meleshko.

2 files changed, 46 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c498913e5a4..6a7d7b6dfdd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,15 @@
 pkgbase = ltex-ls-bin
-	pkgdesc = LTeX Language Server: LSP language server for LanguageTool magheavy_check_mark with support for LaTeX mortar_board, Markdown memo, and others
+	pkgdesc = LTeX Language Server: LSP language server for LanguageTool with support for LaTeX, Markdown, and others
 	pkgver = 15.2.0
-	pkgrel = 1
-	arch = x86_64
+	pkgrel = 2
+	url = https://github.com/valentjn/ltex-ls
+	arch = any
 	license = MPL2
+	depends = java-runtime>=11
+	depends = bash
 	provides = ltex-ls
-	source = https://github.com/valentjn/ltex-ls/releases/download/15.2.0/ltex-ls-15.2.0-linux-x64.tar.gz
-	md5sums = 6234713566e863420c728e32273ed88c
+	conflicts = ltex-ls
+	source = https://github.com/valentjn/ltex-ls/releases/download/15.2.0/ltex-ls-15.2.0.tar.gz
+	sha256sums = ca08c216361a3fd2dce412ee3877b9fa5c9a2a97c3862711efcdec924060a3b2
 
 pkgname = ltex-ls-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2f05ead8100c..760329c1bf21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,46 @@
 # Maintainer: pu <pu.mb@qq.com>
-pkgname=ltex-ls-bin
+# Contributor: Dmytro Meleshko <qzlgeb.zryrfuxb@tznvy.pbz(rot13)>
 _pkgname=ltex-ls
+pkgname="${_pkgname}-bin"
 pkgver=15.2.0
-pkgrel=1
-pkgdesc="LTeX Language Server: LSP language server for LanguageTool magheavy_check_mark with support for LaTeX mortar_board, Markdown memo, and others"
-arch=('x86_64')
-usl="https://github.com/valentjn/ltex-ls"
+pkgrel=2
+pkgdesc="LTeX Language Server: LSP language server for LanguageTool with support for LaTeX, Markdown, and others"
+arch=('any')
+url="https://github.com/valentjn/ltex-ls"
 license=('MPL2')
-provides=('ltex-ls')
-source=("https://github.com/valentjn/ltex-ls/releases/download/15.2.0/ltex-ls-15.2.0-linux-x64.tar.gz")
-md5sums=('6234713566e863420c728e32273ed88c')
+depends=('java-runtime>=11' 'bash')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+source=("${url}/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('ca08c216361a3fd2dce412ee3877b9fa5c9a2a97c3862711efcdec924060a3b2')
 
 package() {
-    install -d "${pkgdir}/opt/${_pkgname}"
-    install -d "${pkgdir}/usr/bin"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
 
-    cp -r "${srcdir}/${_pkgname}-${pkgver}/"* "${pkgdir}/opt/${_pkgname}/"
+    local _appdir="usr/share/${_pkgname}"
+    install -Dm644 "README.md" "LICENSE.md" "ACKNOWLEDGMENTS.md" "changelog.xml" -t "${pkgdir}/${_appdir}/"
+    install -Dm644 "lib"/*.jar -t "${pkgdir}/usr/share/java/${_pkgname}/"
+    ln -sf "/usr/share/java/${_pkgname}" -T "${pkgdir}/${_appdir}/lib"
+    install -Dm644 "bin/.lsp-cli.json" -t "${pkgdir}/${_appdir}/bin/"
 
-    ln -sf /opt/${_pkgname}/bin/ltex-ls "${pkgdir}"/usr/bin/ltex-ls
-    ln -sf /opt/${_pkgname}/bin/ltex-cli "${pkgdir}"/usr/bin/ltex-cli
+    _generate_launcher() {
+        local _bin="$1" _class="$2"
+        install -Dm755 /dev/null -T "${pkgdir}/${_appdir}/bin/${_bin}"
+        cat > "${pkgdir}/${_appdir}/bin/${_bin}" <<EOF
+#!/usr/bin/sh
+exec /usr/bin/java \
+-classpath '/usr/share/java/${_pkgname}/*' \
+-Dapp.name='${_pkgname}' \
+-Dapp.pid="\$\$" \
+-Dapp.repo='/${_appdir}/lib' \
+-Dapp.home='/${_appdir}' \
+-Dbasedir='/${_appdir}' \
+${_class} "\$@"
+EOF
+        install -d "${pkgdir}/usr/bin/"
+        ln -sf "/${_appdir}/bin/${_bin}" -t "${pkgdir}/usr/bin/"
+    }
+
+    _generate_launcher ltex-ls  org.bsplines.ltexls.LtexLanguageServerLauncher
+    _generate_launcher ltex-cli org.bsplines.lspcli.LspCliLauncher
 }