Merge pull request #2 from isomarcte/enforce-java-8-in-launcher-scripts

Enforce Java 8 Runtime

7 files changed, 109 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed71a5e6a985..f1f5f140a921 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = metals
 	pkgdesc = Language Server For Scala
 	pkgver = 0.5.0
-	pkgrel = 5
+	pkgrel = 6
 	url = https://scalameta.org/metals/
 	arch = any
 	license = Apache
@@ -21,46 +21,46 @@ pkgbase = metals
 	source = metals-sublime.sh
 	source = version-fix.patch
 	md5sums = 1893a9e8e8a26431904cced138d8e26d
-	md5sums = 1edc7a3c2859f1f43030d290fdd14605
-	md5sums = 35d1ad5299a50a57b0e9ce01e8db2621
-	md5sums = b0051c6a23d854d238d8c1537d6d21e9
-	md5sums = d663f1f270728007737fc92eba3cdda6
-	md5sums = 8de373e4b778d505ed7b4013f6de3f7d
+	md5sums = 7859cec9d9970fa63ca1c69dea1fb16b
+	md5sums = ad97e9262c7b22dd71b017a6402f612a
+	md5sums = 000bd73ebc3ea46b23e2c418ef97f4c7
+	md5sums = 83b5669127510100d6e7ab4094877a6e
+	md5sums = 38c34ab96f6cf637f7be9f72b7400983
 	md5sums = 1228820359ad5d636e56db35349350f4
 	sha1sums = 8370cb58637a47d0640f4f619c95207374cb5eb7
-	sha1sums = 38c63ddc9a1712faa06082ffa0f62acec9907a12
-	sha1sums = ecbbc90be3f1c928a124369db19a89f58ef24e20
-	sha1sums = 8ff3e8e501179951134c0928fe786cec7b4540f3
-	sha1sums = 980c5f8a923b06f7913e76d373e52f32c6ed5e23
-	sha1sums = 2bac08ea1701ed7ff62a8c7edd0e554a6645ad05
+	sha1sums = a59c93ca5d1c3393d4e416ece96eab9051cc87a5
+	sha1sums = b498568936dcfd03a06d7b41f76bbb7fffbc3bdf
+	sha1sums = 3882901e88f4a85f85d67dcda53f83c89d4563c6
+	sha1sums = f2d0e8aa2744697d4dad0a7c10f835fe5814524b
+	sha1sums = b2577ac4ee93e3a611558294378c185227ed8321
 	sha1sums = feaf909569c00776b67e8d5315332ae3dc02a8b2
 	sha224sums = 24546483700bda5d64cd135bc3d7d53a34b33376ec8a4502c5335385
-	sha224sums = 3ada0159bda461f0d690fd3a04e19273c5bf6b719a5bc5a7f5ed57dc
-	sha224sums = 21773611c91f73cdf2571f77bf88826bd146e99acd5be4d407e8d8ab
-	sha224sums = 212589cddda77208afed3ce3e5d637b7371de29678a5b4268b8813ba
-	sha224sums = 3bd9d54fa01af4ee558440c15825e4a3f4e0cd23e2c625f415b887c7
-	sha224sums = c2aa07b9a5183f5c2838edb170c9e8ebeac3c82ed2ea5f63e6b39889
+	sha224sums = 47e1971c17caa848d068b31e9b1962edbb944a298edb08eec6227df0
+	sha224sums = 43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9
+	sha224sums = a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e
+	sha224sums = 6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e
+	sha224sums = fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e
 	sha224sums = 702ee997e46be69bca262c1be3867203ccb4454df859b8b9ca323d74
 	sha256sums = 57f61352e382cef8c53a674307fcc8aab1d2b44719831830a9d899dbf14f197c
-	sha256sums = 428d5e71f6bee7e8cd522bb5978ca0df9f0099b9554e97398945fa122f8d3b01
-	sha256sums = 477e4e3cb1a1b20afaec654a837bbe15a3269bc7dd657ff5832187104463fbfa
-	sha256sums = 5cd20fa0cd8cd12faa08caca4a4b871b378e8a1694399656a15ca4694ada9f2c
-	sha256sums = 95a05219364440e488f12c173da3516e20ccf4ca4076cdaa1eb3c7b0bf813270
-	sha256sums = cb350148b06cc3ee283b456488d8af9613e07305f3ae4032874c6a1b9f73fa8f
+	sha256sums = 84c1b5a23fe3f82fd183de9740662e618b5371a12b0927ba21f6da2b480f555d
+	sha256sums = b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3
+	sha256sums = e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2
+	sha256sums = c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5
+	sha256sums = fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984
 	sha256sums = 510bab61855505e4e301f98c2b44259964803ced3799fb9fb3d5bc180ba765f9
 	sha384sums = 871a1da43a17de6a7251c0c7c1ae19bf6aa85f293249674ffa535803a75bfcc14714cf19fc6ea0956bdb00f94332517d
-	sha384sums = 27d5b5e691813140340e18f1468c301747b91aa721f7434c3c898b92d3ee81ccf686eb45373ab68db440aa9f0b32a749
-	sha384sums = 43ba683998bbf95934c930ce8e120072ecaba251ba0ece24e9eeff7aa5d9b7d9af6aecac3645f8381252f1c0055ec67f
-	sha384sums = d2cba883c4a9cebb0676583dd62f7870ac73d264ba96b74419f510e528c0f9268ab62356165c74f361078fe507098613
-	sha384sums = c99e9d2000c8201de9d608903406214e0d2ad27ee52ff083e5b28b79c83ade7aca79e80a592438fdf1aab179968d6cbe
-	sha384sums = be07a2f5bad7a95502126ab453821a916ec88c3af1513a3840f2a4306bd7f3eac741f1b065adab9bb2bb23e849f77981
+	sha384sums = edecea6c687d412328bd1916fa3d719e7d4a5145f6c503645707be0123942c3cafea1d6f1ccfed785a3719648a8df8d4
+	sha384sums = 762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288
+	sha384sums = 6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768
+	sha384sums = 26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c
+	sha384sums = 8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7
 	sha384sums = 24ae61e7e62d5b2944093cc1273b9be3a813db436ffe44769e5dbe0dc37f085492950389e0324285bd149c4d818f79ca
 	sha512sums = 21d6bd645ad35b749374b76015e7019375e2723b4e4e1b25dc0a983591f475c5466f1b6840a90b8dcd582e870a25f7d8296c04da8ec6e780512f0a5b53c6dd5c
-	sha512sums = c04c63c959bdab9dc9fefd278a750e08757661bbdf685a078ffd7b7804c1b1c05988aa17fe8d00cd616bc5ff54c137b8774bda66e644c3a385d5950125ce278a
-	sha512sums = 255ac4d9856eed88a6c1b7bcdc51a6e3b434718754b4476e474eac5e3298be65ad1385672132fcb128402e912a2c792438e23323fbf9a2cfa0d282f105105567
-	sha512sums = 8d12ffc5eed49fdc8b16682843377f06955d22dddfb72de814237cfdcf7ca6a42e622c3cfd9d0a9f0fd4f46a4c1f05c7bcb69541e9fcb4f8ba16915d19b523f8
-	sha512sums = 62702baaffd37a562649032d6cc45756a1829876e4b812815483e704457fcefb19849aa5977d729d572c22592da04e87e1e2effa295b797603535527046d1c7a
-	sha512sums = 15d663103edfca27d517c8161914074e4d90fbb069bbf692c1e68d39d9a8157c5878dcd6926481841b732cf4eb3299c42789aef1fe5ec2442aaeba7cf29d185f
+	sha512sums = c9fe648c5d496e7421a022af2b2d713dd627254104cc37e4d6339dbbfdaec1fb2970efffa1f9bd83780c6389e2b64ccb01c75022b6db19d50ece8b0b74b4a152
+	sha512sums = bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205
+	sha512sums = 16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee
+	sha512sums = 722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d
+	sha512sums = 9f32d0ead26fad866f52209c0f6dabdaa3481bafd6121134b2fde6e95a80b5d2757c17ca6f1804b6e060b839efa9a9f7d342d48ad8d22b767e13c585e209045b
 	sha512sums = b4a4eb0bde4045de411b639e16cf41b95e3e50d8950c3a48008d42b60751541e4957c463f4f817320f15488c702d52fb977d3fe63d8832d55f259907f7e0afcf
 
 pkgname = metals
diff --git a/PKGBUILD b/PKGBUILD
index 33f9f9100935..e602fa844e55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Maintainer: David Strawn <isomarcte a__t gmail d__o__t c__o__m>
 pkgname='metals'
 pkgver='0.5.0'
-pkgrel=5
+pkgrel=6
 epoch=
 pkgdesc='Language Server For Scala'
 url='https://scalameta.org/metals/'
@@ -27,46 +27,46 @@ changelog=
 source=("https://github.com/scalameta/${pkgname}/archive/v${pkgver}.tar.gz" 'metals-client.sh' 'metals-emacs.sh' 'metals-vim.sh' 'metals-vscode.sh' 'metals-sublime.sh' 'version-fix.patch')
 noextract=()
 md5sums=('1893a9e8e8a26431904cced138d8e26d'
-         '1edc7a3c2859f1f43030d290fdd14605'
-         '35d1ad5299a50a57b0e9ce01e8db2621'
-         'b0051c6a23d854d238d8c1537d6d21e9'
-         'd663f1f270728007737fc92eba3cdda6'
-         '8de373e4b778d505ed7b4013f6de3f7d'
+         '7859cec9d9970fa63ca1c69dea1fb16b'
+         'ad97e9262c7b22dd71b017a6402f612a'
+         '000bd73ebc3ea46b23e2c418ef97f4c7'
+         '83b5669127510100d6e7ab4094877a6e'
+         '38c34ab96f6cf637f7be9f72b7400983'
          '1228820359ad5d636e56db35349350f4')
 sha1sums=('8370cb58637a47d0640f4f619c95207374cb5eb7'
-          '38c63ddc9a1712faa06082ffa0f62acec9907a12'
-          'ecbbc90be3f1c928a124369db19a89f58ef24e20'
-          '8ff3e8e501179951134c0928fe786cec7b4540f3'
-          '980c5f8a923b06f7913e76d373e52f32c6ed5e23'
-          '2bac08ea1701ed7ff62a8c7edd0e554a6645ad05'
+          'a59c93ca5d1c3393d4e416ece96eab9051cc87a5'
+          'b498568936dcfd03a06d7b41f76bbb7fffbc3bdf'
+          '3882901e88f4a85f85d67dcda53f83c89d4563c6'
+          'f2d0e8aa2744697d4dad0a7c10f835fe5814524b'
+          'b2577ac4ee93e3a611558294378c185227ed8321'
           'feaf909569c00776b67e8d5315332ae3dc02a8b2')
 sha224sums=('24546483700bda5d64cd135bc3d7d53a34b33376ec8a4502c5335385'
-            '3ada0159bda461f0d690fd3a04e19273c5bf6b719a5bc5a7f5ed57dc'
-            '21773611c91f73cdf2571f77bf88826bd146e99acd5be4d407e8d8ab'
-            '212589cddda77208afed3ce3e5d637b7371de29678a5b4268b8813ba'
-            '3bd9d54fa01af4ee558440c15825e4a3f4e0cd23e2c625f415b887c7'
-            'c2aa07b9a5183f5c2838edb170c9e8ebeac3c82ed2ea5f63e6b39889'
+            '47e1971c17caa848d068b31e9b1962edbb944a298edb08eec6227df0'
+            '43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9'
+            'a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e'
+            '6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e'
+            'fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e'
             '702ee997e46be69bca262c1be3867203ccb4454df859b8b9ca323d74')
 sha256sums=('57f61352e382cef8c53a674307fcc8aab1d2b44719831830a9d899dbf14f197c'
-            '428d5e71f6bee7e8cd522bb5978ca0df9f0099b9554e97398945fa122f8d3b01'
-            '477e4e3cb1a1b20afaec654a837bbe15a3269bc7dd657ff5832187104463fbfa'
-            '5cd20fa0cd8cd12faa08caca4a4b871b378e8a1694399656a15ca4694ada9f2c'
-            '95a05219364440e488f12c173da3516e20ccf4ca4076cdaa1eb3c7b0bf813270'
-            'cb350148b06cc3ee283b456488d8af9613e07305f3ae4032874c6a1b9f73fa8f'
+            '84c1b5a23fe3f82fd183de9740662e618b5371a12b0927ba21f6da2b480f555d'
+            'b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3'
+            'e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2'
+            'c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5'
+            'fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984'
             '510bab61855505e4e301f98c2b44259964803ced3799fb9fb3d5bc180ba765f9')
 sha384sums=('871a1da43a17de6a7251c0c7c1ae19bf6aa85f293249674ffa535803a75bfcc14714cf19fc6ea0956bdb00f94332517d'
-            '27d5b5e691813140340e18f1468c301747b91aa721f7434c3c898b92d3ee81ccf686eb45373ab68db440aa9f0b32a749'
-            '43ba683998bbf95934c930ce8e120072ecaba251ba0ece24e9eeff7aa5d9b7d9af6aecac3645f8381252f1c0055ec67f'
-            'd2cba883c4a9cebb0676583dd62f7870ac73d264ba96b74419f510e528c0f9268ab62356165c74f361078fe507098613'
-            'c99e9d2000c8201de9d608903406214e0d2ad27ee52ff083e5b28b79c83ade7aca79e80a592438fdf1aab179968d6cbe'
-            'be07a2f5bad7a95502126ab453821a916ec88c3af1513a3840f2a4306bd7f3eac741f1b065adab9bb2bb23e849f77981'
+            'edecea6c687d412328bd1916fa3d719e7d4a5145f6c503645707be0123942c3cafea1d6f1ccfed785a3719648a8df8d4'
+            '762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288'
+            '6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768'
+            '26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c'
+            '8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7'
             '24ae61e7e62d5b2944093cc1273b9be3a813db436ffe44769e5dbe0dc37f085492950389e0324285bd149c4d818f79ca')
 sha512sums=('21d6bd645ad35b749374b76015e7019375e2723b4e4e1b25dc0a983591f475c5466f1b6840a90b8dcd582e870a25f7d8296c04da8ec6e780512f0a5b53c6dd5c'
-            'c04c63c959bdab9dc9fefd278a750e08757661bbdf685a078ffd7b7804c1b1c05988aa17fe8d00cd616bc5ff54c137b8774bda66e644c3a385d5950125ce278a'
-            '255ac4d9856eed88a6c1b7bcdc51a6e3b434718754b4476e474eac5e3298be65ad1385672132fcb128402e912a2c792438e23323fbf9a2cfa0d282f105105567'
-            '8d12ffc5eed49fdc8b16682843377f06955d22dddfb72de814237cfdcf7ca6a42e622c3cfd9d0a9f0fd4f46a4c1f05c7bcb69541e9fcb4f8ba16915d19b523f8'
-            '62702baaffd37a562649032d6cc45756a1829876e4b812815483e704457fcefb19849aa5977d729d572c22592da04e87e1e2effa295b797603535527046d1c7a'
-            '15d663103edfca27d517c8161914074e4d90fbb069bbf692c1e68d39d9a8157c5878dcd6926481841b732cf4eb3299c42789aef1fe5ec2442aaeba7cf29d185f'
+            'c9fe648c5d496e7421a022af2b2d713dd627254104cc37e4d6339dbbfdaec1fb2970efffa1f9bd83780c6389e2b64ccb01c75022b6db19d50ece8b0b74b4a152'
+            'bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205'
+            '16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee'
+            '722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d'
+            '9f32d0ead26fad866f52209c0f6dabdaa3481bafd6121134b2fde6e95a80b5d2757c17ca6f1804b6e060b839efa9a9f7d342d48ad8d22b767e13c585e209045b'
             'b4a4eb0bde4045de411b639e16cf41b95e3e50d8950c3a48008d42b60751541e4957c463f4f817320f15488c702d52fb977d3fe63d8832d55f259907f7e0afcf')
 validpgpkeys=()
 
diff --git a/metals-client.sh b/metals-client.sh
index 594fbd5080ef..f35c18f26b5f 100755
--- a/metals-client.sh
+++ b/metals-client.sh
@@ -4,6 +4,46 @@ set -e
 
 declare -r _INSTALL_DIR='/usr/share/java/metals'
 declare _CP="$_INSTALL_DIR/lib:$_INSTALL_DIR/metals"
+declare -r -A _JAVA_8_ARCH_RUNTIME_TO_PACKAGE=([java-8-openjdk]='jre8-openjdk-headless')
+declare -r _JAVA_RUNTIME_PATH_PREFIX='/usr/lib/jvm'
+declare -r -A _JAVA_8_ARCH_PACKAGE_PATH_SUFFIXES=([jre8-openjdk-headless]='/java-8-openjdk/jre/bin')
+
+function is_current_java_8 {
+    local -r _CURRENT_JAVA="$(archlinux-java get)"
+    if [ -z "${_JAVA_8_ARCH_RUNTIME_TO_PACKAGE[${_CURRENT_JAVA}]}" ]
+    then
+        return 1
+    else
+        return 0
+    fi
+}
+
+function ensure_java_8 {
+    if is_current_java_8
+    then
+        return 0
+    else
+        for _PACKAGE in "${_JAVA_8_ARCH_RUNTIME_TO_PACKAGE[@]}"
+        do
+            if [ -z "$_PACKAGE" ]
+            then
+                continue
+            else
+                local _PACKAGE_SUFFIX="${_JAVA_8_ARCH_PACKAGE_PATH_SUFFIXES[${_PACKAGE}]}"
+                local _PACKAGE_PATH="$_JAVA_RUNTIME_PATH_PREFIX$_PACKAGE_SUFFIX"
+                if [ -n "$_PACKAGE_SUFFIX" ] && [ -d "$_PACKAGE_PATH" ]
+                then
+                    export PATH="$_PACKAGE_PATH:$PATH"
+                    return 0
+                else
+                    continue
+                fi
+            fi
+        done
+        echo 'Unable to find local Java 8 Runtime. This is probably a bug with the Arch Linux launcher script. Please report it at https://aur.archlinux.org/packages/metals' 1>&2
+        exit 1
+    fi
+}
 
 function build_cp {
     while read -r name
@@ -13,11 +53,13 @@ function build_cp {
 }
 
 function main {
+    ensure_java_8
+
     build_cp
 
     # Java options taken from metals-emacs documentation
     # https://scalameta.org/metals/docs/editors/emacs.HTML
-    java -XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m -Dmetals.client="$_METALS_CLIENT" -cp "$_CP" scala.meta.metals.Main "$@"
+    exec java -XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m -Dmetals.client="$_METALS_CLIENT" -cp "$_CP" scala.meta.metals.Main "$@"
 }
 
 main "$@"
diff --git a/metals-emacs.sh b/metals-emacs.sh
index f248ea26a4b5..ea3f2091429c 100755
--- a/metals-emacs.sh
+++ b/metals-emacs.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-_METALS_CLIENT=emacs metals-client "$@"
+_METALS_CLIENT=emacs exec metals-client "$@"
diff --git a/metals-sublime.sh b/metals-sublime.sh
index dd45ec72ddc3..2232602edee3 100755
--- a/metals-sublime.sh
+++ b/metals-sublime.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-_METALS_CLIENT=sublime metals-client "$@"
+_METALS_CLIENT=sublime exec metals-client "$@"
diff --git a/metals-vim.sh b/metals-vim.sh
index b1aa813880bb..05e8eacd6f7d 100755
--- a/metals-vim.sh
+++ b/metals-vim.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-_METALS_CLIENT=vim-lsc metals-client "$@"
+_METALS_CLIENT=vim-lsc exec metals-client "$@"
diff --git a/metals-vscode.sh b/metals-vscode.sh
index 25eff6765652..b4f2f5f25111 100755
--- a/metals-vscode.sh
+++ b/metals-vscode.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-_METALS_CLIENT=vscode metals-client "$@"
+_METALS_CLIENT=vscode exec metals-client "$@"