Fix Bug In JREMajorVersion.java

It failed when the version number had only one section, e.g. "15" as opposed to "15.0.0".

4 files changed, 36 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 373fa9706bbf..a1c4ada926f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = metals
 	pkgdesc = Language Server For Scala
 	pkgver = 0.9.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://scalameta.org/metals/
 	install = metals.install
 	arch = any
@@ -23,53 +23,53 @@ pkgbase = metals
 	source = version-fix.patch
 	source = JREMajorVersion.java
 	md5sums = 675f9ff27e220ddbac56604e0438ef25
-	md5sums = 2b4f3f9f77eb5af4107f9539923483ff
+	md5sums = 1d0b48af2e8a16f80177f8e73e7ef383
 	md5sums = ad97e9262c7b22dd71b017a6402f612a
 	md5sums = 000bd73ebc3ea46b23e2c418ef97f4c7
 	md5sums = 83b5669127510100d6e7ab4094877a6e
 	md5sums = 38c34ab96f6cf637f7be9f72b7400983
 	md5sums = 1d7f1e0c3d6cca8f246968845f2ee3bd
-	md5sums = 778c5748f51da0f0d39d5e19970249eb
+	md5sums = 8a6b25ac88a8836a68d9dc55b4d17eda
 	sha1sums = 1e72400576a79afc2e7da8fb2f9aec5edcf0b7c4
-	sha1sums = d4127d36d9b1d7ab07650f59d84c536c7a86d349
+	sha1sums = 9adaef9256e7d77e8b16ecb046e4a746771e9bb1
 	sha1sums = b498568936dcfd03a06d7b41f76bbb7fffbc3bdf
 	sha1sums = 3882901e88f4a85f85d67dcda53f83c89d4563c6
 	sha1sums = f2d0e8aa2744697d4dad0a7c10f835fe5814524b
 	sha1sums = b2577ac4ee93e3a611558294378c185227ed8321
 	sha1sums = 121eaad87ef2c25db4530b43b78263fec5582102
-	sha1sums = dc64de951379d01d2d1d211ceab71fc9398cc199
+	sha1sums = c95efcaad9c6417d858575a381648a4c9a928a46
 	sha224sums = faf079297295440315cba41851affa93dd2454cccd622f2648919d57
-	sha224sums = 0ed6eb578a9c2e8826b9a1236b22458b1bbc538affc1c580741ac506
+	sha224sums = c752a8044b6b31dfb90f0c006c271060e1f6c984f949b5cd2b2a5515
 	sha224sums = 43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9
 	sha224sums = a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e
 	sha224sums = 6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e
 	sha224sums = fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e
 	sha224sums = b2dac2daa95ae21b4e0087d8bdae16d735335557dc7ef33ed459afaf
-	sha224sums = 3a449ae946a8b4e91203037d980160b8d1798bbd08f21bb88b626c09
+	sha224sums = 1566b25eee6a99d3e6ca78497e7393c8466bf6e919681054ba14c4af
 	sha256sums = 59d9abef72e4197b04f3b40e8499e09613c96bcaa267ab98b6f56c3521222af4
-	sha256sums = 9948e63e7c3db57838784df44e53478ca7704150bb7bac6179fedba0377a5acf
+	sha256sums = 9a274276578e6c9770da8c8dc90dc06560c3a67ea87853a625aa03b707ed360e
 	sha256sums = b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3
 	sha256sums = e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2
 	sha256sums = c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5
 	sha256sums = fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984
 	sha256sums = 5eed3b8c4c5b13209004c9c0172fb8163587686014e17c0808d007193909834d
-	sha256sums = c73c831ba67e2b80df65f08a00b264af8e150d48a1e321b9cfb68081a9eae6b5
+	sha256sums = 379144a4e426683565c46916adb105fe1afa1e1daf98f557883feeca1aa95d43
 	sha384sums = fb86c54bdad5a3c7ffff67b72ce8791c45b6b00c5f26e9f8a7fd874a7cc70c1a6915804fb3dbff51e3a92cf9653a7fda
-	sha384sums = 5c1c4d43b4eb0c936412c75e969529c39553d9007ab5e4b21ed42be55ec5965cf8f2ea2aff3122e2da5e288e7f33ea15
+	sha384sums = 4a4d45991c93b3abc30757cd974d4f31f7ce9e7804f67d9bde46fed3f670a275ef940ab19053dc52e3782f02fdab6993
 	sha384sums = 762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288
 	sha384sums = 6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768
 	sha384sums = 26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c
 	sha384sums = 8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7
 	sha384sums = d219ec79dee868f933ecc97c28e771286c8a5f7e8d0aedd25fb107064d134a27c8c301658aa3e05a4f8b82e146b87278
-	sha384sums = 9f20595ff54ffaee74e6d1d6045cadca7df2326c8d451dc7d96925870820cf24108afdc7bb6e3bfad3f28d1d45d3d0ba
+	sha384sums = eba6ead826268c42600ba41098bfcfaa1a13e4f7f5f8f367af6836995c41ad125ef5c5464242727b1c0f10caa3b4de37
 	sha512sums = 34ece6f96b5544050b639e3c539a769a5cae65f8a30e67625f3547c9c4f112788faffecca5fc92b9c3638116669be92bd7edcd6e25625feb201f94d5b81eb229
-	sha512sums = 70a676c8a40e8da741def75cd8b03424d20d9a9b46fae397e3eab5ecf73deac348c641803f019eb9c380f30f6eea2003a26a6bc773f332e4f8cd89019ac37c89
+	sha512sums = 96e5306816fd15ed338d27d3929e798feff16d3eb9929216e4333fc44439380ae026294095a6464f8d1dc9453e932b3ead567a9abfec55dad08e6f42208b5619
 	sha512sums = bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205
 	sha512sums = 16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee
 	sha512sums = 722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d
 	sha512sums = 9f32d0ead26fad866f52209c0f6dabdaa3481bafd6121134b2fde6e95a80b5d2757c17ca6f1804b6e060b839efa9a9f7d342d48ad8d22b767e13c585e209045b
 	sha512sums = 7d20bc0c8d144f041591ef3e0a4be21b257c7608168fbc862b660c0b37d3fbf61c191d502b5651179348dbcfa4333526ee7076057ea4d29217e95b8afe8c99b0
-	sha512sums = 4daebe1e0681d9981e4538d79136f7ef02c0b7fb53eaadc64f9b4fce5a4b0a5074752d56e6cc0ed0558f8e389194629aeaaf368685d01c1d63dcee669a67df4c
+	sha512sums = 584a795a05ddae117bbd777963ac38189f2e5929a1c69bd143d3acf6f02e42fb7eef8b74f989e560dcd49f8fe469984b60d6d7bbb4f82ee173e95d8a237551af
 
 pkgname = metals
 
diff --git a/JREMajorVersion.java b/JREMajorVersion.java
index f89adb9a3520..92b8de59fffc 100644
--- a/JREMajorVersion.java
+++ b/JREMajorVersion.java
@@ -9,14 +9,16 @@ public final class JREMajorVersion {
       throw new AssertionError("System property \"java.version\" is null. " + JREMajorVersion.bugLink);
     } else {
       final String[] javaVersionComponents = javaVersion.split("\\.");
-      if (javaVersionComponents.length < 2) {
-        throw new AssertionError("Unable to determine Java version because System property \"java.version\" has < 2 components. Value found: " + javaVersion + ". " + JREMajorVersion.bugLink);
+      if (javaVersionComponents.length < 1) {
+        // In this case there is no '.' in the version number, e.g. it
+        // is "15"
+        return javaVersion;
+      } else if (javaVersionComponents[0].equals("1")) {
+        // Probably using the older version number scheme,
+        // e.g. "1.8.0"
+        return javaVersionComponents[1];
       } else {
-        if (javaVersionComponents[0].equals("1")) {
-          return javaVersionComponents[1];
-        } else {
-          return javaVersionComponents[0];
-        }
+        return javaVersionComponents[0];
       }
     }
   }
diff --git a/PKGBUILD b/PKGBUILD
index e3e5d0732125..469368cadb7f 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.9.4'
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc='Language Server For Scala'
 url='https://scalameta.org/metals/'
@@ -27,53 +27,53 @@ 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' 'JREMajorVersion.java')
 noextract=()
 md5sums=('675f9ff27e220ddbac56604e0438ef25'
-         '2b4f3f9f77eb5af4107f9539923483ff'
+         '1d0b48af2e8a16f80177f8e73e7ef383'
          'ad97e9262c7b22dd71b017a6402f612a'
          '000bd73ebc3ea46b23e2c418ef97f4c7'
          '83b5669127510100d6e7ab4094877a6e'
          '38c34ab96f6cf637f7be9f72b7400983'
          '1d7f1e0c3d6cca8f246968845f2ee3bd'
-         '778c5748f51da0f0d39d5e19970249eb')
+         '8a6b25ac88a8836a68d9dc55b4d17eda')
 sha1sums=('1e72400576a79afc2e7da8fb2f9aec5edcf0b7c4'
-          'd4127d36d9b1d7ab07650f59d84c536c7a86d349'
+          '9adaef9256e7d77e8b16ecb046e4a746771e9bb1'
           'b498568936dcfd03a06d7b41f76bbb7fffbc3bdf'
           '3882901e88f4a85f85d67dcda53f83c89d4563c6'
           'f2d0e8aa2744697d4dad0a7c10f835fe5814524b'
           'b2577ac4ee93e3a611558294378c185227ed8321'
           '121eaad87ef2c25db4530b43b78263fec5582102'
-          'dc64de951379d01d2d1d211ceab71fc9398cc199')
+          'c95efcaad9c6417d858575a381648a4c9a928a46')
 sha224sums=('faf079297295440315cba41851affa93dd2454cccd622f2648919d57'
-            '0ed6eb578a9c2e8826b9a1236b22458b1bbc538affc1c580741ac506'
+            'c752a8044b6b31dfb90f0c006c271060e1f6c984f949b5cd2b2a5515'
             '43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9'
             'a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e'
             '6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e'
             'fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e'
             'b2dac2daa95ae21b4e0087d8bdae16d735335557dc7ef33ed459afaf'
-            '3a449ae946a8b4e91203037d980160b8d1798bbd08f21bb88b626c09')
+            '1566b25eee6a99d3e6ca78497e7393c8466bf6e919681054ba14c4af')
 sha256sums=('59d9abef72e4197b04f3b40e8499e09613c96bcaa267ab98b6f56c3521222af4'
-            '9948e63e7c3db57838784df44e53478ca7704150bb7bac6179fedba0377a5acf'
+            '9a274276578e6c9770da8c8dc90dc06560c3a67ea87853a625aa03b707ed360e'
             'b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3'
             'e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2'
             'c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5'
             'fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984'
             '5eed3b8c4c5b13209004c9c0172fb8163587686014e17c0808d007193909834d'
-            'c73c831ba67e2b80df65f08a00b264af8e150d48a1e321b9cfb68081a9eae6b5')
+            '379144a4e426683565c46916adb105fe1afa1e1daf98f557883feeca1aa95d43')
 sha384sums=('fb86c54bdad5a3c7ffff67b72ce8791c45b6b00c5f26e9f8a7fd874a7cc70c1a6915804fb3dbff51e3a92cf9653a7fda'
-            '5c1c4d43b4eb0c936412c75e969529c39553d9007ab5e4b21ed42be55ec5965cf8f2ea2aff3122e2da5e288e7f33ea15'
+            '4a4d45991c93b3abc30757cd974d4f31f7ce9e7804f67d9bde46fed3f670a275ef940ab19053dc52e3782f02fdab6993'
             '762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288'
             '6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768'
             '26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c'
             '8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7'
             'd219ec79dee868f933ecc97c28e771286c8a5f7e8d0aedd25fb107064d134a27c8c301658aa3e05a4f8b82e146b87278'
-            '9f20595ff54ffaee74e6d1d6045cadca7df2326c8d451dc7d96925870820cf24108afdc7bb6e3bfad3f28d1d45d3d0ba')
+            'eba6ead826268c42600ba41098bfcfaa1a13e4f7f5f8f367af6836995c41ad125ef5c5464242727b1c0f10caa3b4de37')
 sha512sums=('34ece6f96b5544050b639e3c539a769a5cae65f8a30e67625f3547c9c4f112788faffecca5fc92b9c3638116669be92bd7edcd6e25625feb201f94d5b81eb229'
-            '70a676c8a40e8da741def75cd8b03424d20d9a9b46fae397e3eab5ecf73deac348c641803f019eb9c380f30f6eea2003a26a6bc773f332e4f8cd89019ac37c89'
+            '96e5306816fd15ed338d27d3929e798feff16d3eb9929216e4333fc44439380ae026294095a6464f8d1dc9453e932b3ead567a9abfec55dad08e6f42208b5619'
             'bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205'
             '16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee'
             '722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d'
             '9f32d0ead26fad866f52209c0f6dabdaa3481bafd6121134b2fde6e95a80b5d2757c17ca6f1804b6e060b839efa9a9f7d342d48ad8d22b767e13c585e209045b'
             '7d20bc0c8d144f041591ef3e0a4be21b257c7608168fbc862b660c0b37d3fbf61c191d502b5651179348dbcfa4333526ee7076057ea4d29217e95b8afe8c99b0'
-            '4daebe1e0681d9981e4538d79136f7ef02c0b7fb53eaadc64f9b4fce5a4b0a5074752d56e6cc0ed0558f8e389194629aeaaf368685d01c1d63dcee669a67df4c')
+            '584a795a05ddae117bbd777963ac38189f2e5929a1c69bd143d3acf6f02e42fb7eef8b74f989e560dcd49f8fe469984b60d6d7bbb4f82ee173e95d8a237551af')
 validpgpkeys=()
 install=metals.install
 
diff --git a/metals-client.sh b/metals-client.sh
index 64f8b002f3a6..80ba5383e6ea 100755
--- a/metals-client.sh
+++ b/metals-client.sh
@@ -80,7 +80,7 @@ function build_cp {
 
 function determine_jre_version {
     pushd "$_UTIL_DIR" &>/dev/null
-    _JRE_VERSION="$(java JREMajorVersion 2>/dev/null)"
+    _JRE_VERSION="$(java JREMajorVersion)"
     popd &>/dev/null
     readonly _JRE_VERSION
     echo "JRE version determined to be ${_JRE_VERSION}" 1>&2