Merge pull request #4 from isomarcte/fallback-to-default-java

Fallback To Current Java If We Can't Figure Out Which The JDK Path

3 files changed, 15 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1f5f140a921..630cac7e4cff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = metals
 	pkgdesc = Language Server For Scala
 	pkgver = 0.5.0
-	pkgrel = 6
+	pkgrel = 7
 	url = https://scalameta.org/metals/
 	arch = any
 	license = Apache
@@ -21,42 +21,42 @@ pkgbase = metals
 	source = metals-sublime.sh
 	source = version-fix.patch
 	md5sums = 1893a9e8e8a26431904cced138d8e26d
-	md5sums = 7859cec9d9970fa63ca1c69dea1fb16b
+	md5sums = 35ee070c7f53e7e02498be2e4c56d816
 	md5sums = ad97e9262c7b22dd71b017a6402f612a
 	md5sums = 000bd73ebc3ea46b23e2c418ef97f4c7
 	md5sums = 83b5669127510100d6e7ab4094877a6e
 	md5sums = 38c34ab96f6cf637f7be9f72b7400983
 	md5sums = 1228820359ad5d636e56db35349350f4
 	sha1sums = 8370cb58637a47d0640f4f619c95207374cb5eb7
-	sha1sums = a59c93ca5d1c3393d4e416ece96eab9051cc87a5
+	sha1sums = 8e1b6939afe4dd9a845edbdb5d61dab1c69f62c3
 	sha1sums = b498568936dcfd03a06d7b41f76bbb7fffbc3bdf
 	sha1sums = 3882901e88f4a85f85d67dcda53f83c89d4563c6
 	sha1sums = f2d0e8aa2744697d4dad0a7c10f835fe5814524b
 	sha1sums = b2577ac4ee93e3a611558294378c185227ed8321
 	sha1sums = feaf909569c00776b67e8d5315332ae3dc02a8b2
 	sha224sums = 24546483700bda5d64cd135bc3d7d53a34b33376ec8a4502c5335385
-	sha224sums = 47e1971c17caa848d068b31e9b1962edbb944a298edb08eec6227df0
+	sha224sums = 438186ea833e286e9b531987d5867d47c9ae9d1127b6c038b672ff43
 	sha224sums = 43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9
 	sha224sums = a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e
 	sha224sums = 6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e
 	sha224sums = fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e
 	sha224sums = 702ee997e46be69bca262c1be3867203ccb4454df859b8b9ca323d74
 	sha256sums = 57f61352e382cef8c53a674307fcc8aab1d2b44719831830a9d899dbf14f197c
-	sha256sums = 84c1b5a23fe3f82fd183de9740662e618b5371a12b0927ba21f6da2b480f555d
+	sha256sums = 8d71d694bc627f788b4d53c5f49327f6e7cd353856f5e4892d33769268767b00
 	sha256sums = b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3
 	sha256sums = e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2
 	sha256sums = c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5
 	sha256sums = fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984
 	sha256sums = 510bab61855505e4e301f98c2b44259964803ced3799fb9fb3d5bc180ba765f9
 	sha384sums = 871a1da43a17de6a7251c0c7c1ae19bf6aa85f293249674ffa535803a75bfcc14714cf19fc6ea0956bdb00f94332517d
-	sha384sums = edecea6c687d412328bd1916fa3d719e7d4a5145f6c503645707be0123942c3cafea1d6f1ccfed785a3719648a8df8d4
+	sha384sums = 9246da0123e02641954b1fcca7213c37599cfbf03a7d8fb8dcc49f4f5dbc523931126f202d62459f0bb600f60ccf3648
 	sha384sums = 762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288
 	sha384sums = 6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768
 	sha384sums = 26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c
 	sha384sums = 8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7
 	sha384sums = 24ae61e7e62d5b2944093cc1273b9be3a813db436ffe44769e5dbe0dc37f085492950389e0324285bd149c4d818f79ca
 	sha512sums = 21d6bd645ad35b749374b76015e7019375e2723b4e4e1b25dc0a983591f475c5466f1b6840a90b8dcd582e870a25f7d8296c04da8ec6e780512f0a5b53c6dd5c
-	sha512sums = c9fe648c5d496e7421a022af2b2d713dd627254104cc37e4d6339dbbfdaec1fb2970efffa1f9bd83780c6389e2b64ccb01c75022b6db19d50ece8b0b74b4a152
+	sha512sums = a9cca2cb0b75fabc93b0b9b5de7228503c3f35638944ce5bccd4cd6bcb097de784e12be1d620546e57b85bb13b8c11a05e1183c52fc1cb914b32f4247efcbcb4
 	sha512sums = bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205
 	sha512sums = 16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee
 	sha512sums = 722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d
diff --git a/PKGBUILD b/PKGBUILD
index e602fa844e55..715e6511b86e 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=6
+pkgrel=7
 epoch=
 pkgdesc='Language Server For Scala'
 url='https://scalameta.org/metals/'
@@ -27,42 +27,42 @@ 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'
-         '7859cec9d9970fa63ca1c69dea1fb16b'
+         '35ee070c7f53e7e02498be2e4c56d816'
          'ad97e9262c7b22dd71b017a6402f612a'
          '000bd73ebc3ea46b23e2c418ef97f4c7'
          '83b5669127510100d6e7ab4094877a6e'
          '38c34ab96f6cf637f7be9f72b7400983'
          '1228820359ad5d636e56db35349350f4')
 sha1sums=('8370cb58637a47d0640f4f619c95207374cb5eb7'
-          'a59c93ca5d1c3393d4e416ece96eab9051cc87a5'
+          '8e1b6939afe4dd9a845edbdb5d61dab1c69f62c3'
           'b498568936dcfd03a06d7b41f76bbb7fffbc3bdf'
           '3882901e88f4a85f85d67dcda53f83c89d4563c6'
           'f2d0e8aa2744697d4dad0a7c10f835fe5814524b'
           'b2577ac4ee93e3a611558294378c185227ed8321'
           'feaf909569c00776b67e8d5315332ae3dc02a8b2')
 sha224sums=('24546483700bda5d64cd135bc3d7d53a34b33376ec8a4502c5335385'
-            '47e1971c17caa848d068b31e9b1962edbb944a298edb08eec6227df0'
+            '438186ea833e286e9b531987d5867d47c9ae9d1127b6c038b672ff43'
             '43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9'
             'a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e'
             '6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e'
             'fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e'
             '702ee997e46be69bca262c1be3867203ccb4454df859b8b9ca323d74')
 sha256sums=('57f61352e382cef8c53a674307fcc8aab1d2b44719831830a9d899dbf14f197c'
-            '84c1b5a23fe3f82fd183de9740662e618b5371a12b0927ba21f6da2b480f555d'
+            '8d71d694bc627f788b4d53c5f49327f6e7cd353856f5e4892d33769268767b00'
             'b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3'
             'e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2'
             'c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5'
             'fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984'
             '510bab61855505e4e301f98c2b44259964803ced3799fb9fb3d5bc180ba765f9')
 sha384sums=('871a1da43a17de6a7251c0c7c1ae19bf6aa85f293249674ffa535803a75bfcc14714cf19fc6ea0956bdb00f94332517d'
-            'edecea6c687d412328bd1916fa3d719e7d4a5145f6c503645707be0123942c3cafea1d6f1ccfed785a3719648a8df8d4'
+            '9246da0123e02641954b1fcca7213c37599cfbf03a7d8fb8dcc49f4f5dbc523931126f202d62459f0bb600f60ccf3648'
             '762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288'
             '6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768'
             '26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c'
             '8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7'
             '24ae61e7e62d5b2944093cc1273b9be3a813db436ffe44769e5dbe0dc37f085492950389e0324285bd149c4d818f79ca')
 sha512sums=('21d6bd645ad35b749374b76015e7019375e2723b4e4e1b25dc0a983591f475c5466f1b6840a90b8dcd582e870a25f7d8296c04da8ec6e780512f0a5b53c6dd5c'
-            'c9fe648c5d496e7421a022af2b2d713dd627254104cc37e4d6339dbbfdaec1fb2970efffa1f9bd83780c6389e2b64ccb01c75022b6db19d50ece8b0b74b4a152'
+            'a9cca2cb0b75fabc93b0b9b5de7228503c3f35638944ce5bccd4cd6bcb097de784e12be1d620546e57b85bb13b8c11a05e1183c52fc1cb914b32f4247efcbcb4'
             'bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205'
             '16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee'
             '722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d'
diff --git a/metals-client.sh b/metals-client.sh
index f35c18f26b5f..10c337eae9d9 100755
--- a/metals-client.sh
+++ b/metals-client.sh
@@ -40,8 +40,7 @@ function ensure_java_8 {
                 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
+        echo 'Unable to find a Java 8 environment with certainty. Attempt to use the current environment.' 1>&2
     fi
 }