summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Strawn2019-05-16 07:54:25 -0600
committerDavid Strawn2019-05-16 08:53:03 -0600
commit2b3e2c8482e19d24b212f7d8bfabe7815c8c6055 (patch)
tree3e692351d6018530f8a340e8c6ec153581381317
parent43e1c406c2d22b80808dfb5ca4d16213a7ffffa8 (diff)
downloadaur-2b3e2c8482e19d24b212f7d8bfabe7815c8c6055.tar.gz
Echo Out The Full Path To The Java Version We Will Use
-rw-r--r--.SRCINFO15
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD14
-rwxr-xr-xmetals-client.sh3
4 files changed, 18 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 92a1dd3812aa..2f3ac11207e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = metals
pkgdesc = Language Server For Scala
pkgver = 0.5.2
- pkgrel = 1
+ pkgrel = 2
url = https://scalameta.org/metals/
arch = any
license = Apache
@@ -21,42 +21,42 @@ pkgbase = metals
source = metals-sublime.sh
source = version-fix.patch
md5sums = f9d0117ba797306b46ab9eda19da74a3
- md5sums = 35ee070c7f53e7e02498be2e4c56d816
+ md5sums = fdabd986559b98afc70bb29c7af812c3
md5sums = ad97e9262c7b22dd71b017a6402f612a
md5sums = 000bd73ebc3ea46b23e2c418ef97f4c7
md5sums = 83b5669127510100d6e7ab4094877a6e
md5sums = 38c34ab96f6cf637f7be9f72b7400983
md5sums = 96ff5b1033f281bdce3d21e1e1586508
sha1sums = f1b2f0da46161f0fe21afaa22599e69981e6c056
- sha1sums = 8e1b6939afe4dd9a845edbdb5d61dab1c69f62c3
+ sha1sums = 4ea933ba29eb25378d135deeaced1e106bf6cfd1
sha1sums = b498568936dcfd03a06d7b41f76bbb7fffbc3bdf
sha1sums = 3882901e88f4a85f85d67dcda53f83c89d4563c6
sha1sums = f2d0e8aa2744697d4dad0a7c10f835fe5814524b
sha1sums = b2577ac4ee93e3a611558294378c185227ed8321
sha1sums = b25c3700bcd15ecdee3b9d7a649a4a8fa87bdd9f
sha224sums = 0624dec0fa0ae5e75f84e16c768071ca072ebde590a61631adae927d
- sha224sums = 438186ea833e286e9b531987d5867d47c9ae9d1127b6c038b672ff43
+ sha224sums = bea7d91829a339d6b2f1232287df02ddfc52db78ec3d055c77184915
sha224sums = 43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9
sha224sums = a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e
sha224sums = 6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e
sha224sums = fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e
sha224sums = 8a9b731676215524d69b82f88986405dffc290429d4efc9b38322eef
sha256sums = 32400e1ce88d6c44aa96ea113267a232702b7e3b58a0098a2fc99f07e8668e94
- sha256sums = 8d71d694bc627f788b4d53c5f49327f6e7cd353856f5e4892d33769268767b00
+ sha256sums = 2a3a335a4ab5587542bbf1123d0dfc726b2267fe90b9c33285cd97b4224ee725
sha256sums = b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3
sha256sums = e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2
sha256sums = c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5
sha256sums = fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984
sha256sums = 5989ec04f63efd425e29ff39dcd34f72cfd0dc9887a4424311cacf146fa951ea
sha384sums = d75d5c43bae9cb26101782de6981699aa60b6e4d7badbaef49a83b08fac1566327daf17a1d3178e619f1546686c87995
- sha384sums = 9246da0123e02641954b1fcca7213c37599cfbf03a7d8fb8dcc49f4f5dbc523931126f202d62459f0bb600f60ccf3648
+ sha384sums = 731f42aa9fd996db063dfdf3de18b87e235f065462450b5320071649eb331cdc6abfc4b6531a53d0b5c4f66ff65a018e
sha384sums = 762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288
sha384sums = 6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768
sha384sums = 26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c
sha384sums = 8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7
sha384sums = 36804b65b231e0b39a30241ff6394203a14e0de4c94ded6cf39405f028884a09f8e09cddbb4f3acbb70e3f3ae9f77dae
sha512sums = 66f09b1b78872eeb597dae9e0b6b84e28302155797b438434602bc781ec85e423f7eaf6c30f332ebb4bea5eb1854c1594d7ae7aa14009c6a7a918a855d369ae6
- sha512sums = a9cca2cb0b75fabc93b0b9b5de7228503c3f35638944ce5bccd4cd6bcb097de784e12be1d620546e57b85bb13b8c11a05e1183c52fc1cb914b32f4247efcbcb4
+ sha512sums = 46f297d82500c3c90ddae090a72b18b0dc4ead415a2c20f3ef8ff6e61f74f807c3bce95fa360f153b467b0ab4cd627808e2c8081fad5801120efeb1e82b8cbab
sha512sums = bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205
sha512sums = 16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee
sha512sums = 722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d
@@ -64,4 +64,3 @@ pkgbase = metals
sha512sums = 0912633098517aff79fbd7a3c8c42e7d9fe69b94dff1d3c65dccf3b1288eb31f1227d4b048730a57641772285cf9510d0dd4819e2bfd9dacb71a58524dcaf871
pkgname = metals
-
diff --git a/.gitignore b/.gitignore
index 6ba7113a8f90..27a6d54c0e22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/pkg/
/*.log
/metals-*.tar.xz
+/v*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index b06c4646fa9e..15ca3cf02260 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.2'
-pkgrel=1
+pkgrel=2
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=('f9d0117ba797306b46ab9eda19da74a3'
- '35ee070c7f53e7e02498be2e4c56d816'
+ 'fdabd986559b98afc70bb29c7af812c3'
'ad97e9262c7b22dd71b017a6402f612a'
'000bd73ebc3ea46b23e2c418ef97f4c7'
'83b5669127510100d6e7ab4094877a6e'
'38c34ab96f6cf637f7be9f72b7400983'
'96ff5b1033f281bdce3d21e1e1586508')
sha1sums=('f1b2f0da46161f0fe21afaa22599e69981e6c056'
- '8e1b6939afe4dd9a845edbdb5d61dab1c69f62c3'
+ '4ea933ba29eb25378d135deeaced1e106bf6cfd1'
'b498568936dcfd03a06d7b41f76bbb7fffbc3bdf'
'3882901e88f4a85f85d67dcda53f83c89d4563c6'
'f2d0e8aa2744697d4dad0a7c10f835fe5814524b'
'b2577ac4ee93e3a611558294378c185227ed8321'
'b25c3700bcd15ecdee3b9d7a649a4a8fa87bdd9f')
sha224sums=('0624dec0fa0ae5e75f84e16c768071ca072ebde590a61631adae927d'
- '438186ea833e286e9b531987d5867d47c9ae9d1127b6c038b672ff43'
+ 'bea7d91829a339d6b2f1232287df02ddfc52db78ec3d055c77184915'
'43d2f6b0b4b7ef539f5109b1127dcd88828f2f8ae0b9c052899af1c9'
'a99d9457fd6cf582b349e56e5e8e9cece30e33ff6866c5969f090f5e'
'6ffcb9ee870dd260f90e333082e90b9b30212f1f21dd3d3a0048a67e'
'fff5cbeed72e44f9159872f59a0ca0a19fc81a8ed943500373e9108e'
'8a9b731676215524d69b82f88986405dffc290429d4efc9b38322eef')
sha256sums=('32400e1ce88d6c44aa96ea113267a232702b7e3b58a0098a2fc99f07e8668e94'
- '8d71d694bc627f788b4d53c5f49327f6e7cd353856f5e4892d33769268767b00'
+ '2a3a335a4ab5587542bbf1123d0dfc726b2267fe90b9c33285cd97b4224ee725'
'b3579e68cee7f23f6f6a12fe0bc6396f1722434d23ce3c58e7c9fac2233cd1d3'
'e9bbc61ec99dc0893560a12a8a0f56c9f27016895e177a164019ab9174fe94e2'
'c2213c8d4a1a0fe5bb12d5bcde53ab04d9b0aa08ddcabd60de938a8d480e49d5'
'fb42157046a11089fa69e0120ae83ff3bc354709e2add4644fe3fc60aa80c984'
'5989ec04f63efd425e29ff39dcd34f72cfd0dc9887a4424311cacf146fa951ea')
sha384sums=('d75d5c43bae9cb26101782de6981699aa60b6e4d7badbaef49a83b08fac1566327daf17a1d3178e619f1546686c87995'
- '9246da0123e02641954b1fcca7213c37599cfbf03a7d8fb8dcc49f4f5dbc523931126f202d62459f0bb600f60ccf3648'
+ '731f42aa9fd996db063dfdf3de18b87e235f065462450b5320071649eb331cdc6abfc4b6531a53d0b5c4f66ff65a018e'
'762dd7c73e994b74ebeb5c975ca0b53ddf4cbf181664d465bd9c543798333dcc4939c360a4b5b8b1b162810ea363d288'
'6bee0d21d0fcf3d8f5ee14545be63fb2bbababb0665020540daafc708939bbc539ab940cfe122b2281156bc78d401768'
'26859b59a04e38a5e7d02e188643765d06b893385232895f5b1435fb3d4fa4d676e8d43bbc80360f9ee7a2ee01e64d2c'
'8b9204ce4a60890eb94f0fe673504a9a10c583b9814e844da14b8d1313db7f8cf7d5f9a7b8db0bbd25fb2f9263e434b7'
'36804b65b231e0b39a30241ff6394203a14e0de4c94ded6cf39405f028884a09f8e09cddbb4f3acbb70e3f3ae9f77dae')
sha512sums=('66f09b1b78872eeb597dae9e0b6b84e28302155797b438434602bc781ec85e423f7eaf6c30f332ebb4bea5eb1854c1594d7ae7aa14009c6a7a918a855d369ae6'
- 'a9cca2cb0b75fabc93b0b9b5de7228503c3f35638944ce5bccd4cd6bcb097de784e12be1d620546e57b85bb13b8c11a05e1183c52fc1cb914b32f4247efcbcb4'
+ '46f297d82500c3c90ddae090a72b18b0dc4ead415a2c20f3ef8ff6e61f74f807c3bce95fa360f153b467b0ab4cd627808e2c8081fad5801120efeb1e82b8cbab'
'bd26818e43627c4e20aa931663b4623e45ade0930a29952d6508fa6e1302f5140afed7f57a796c12da3e9ae256ff7c0b3eb2e5075b00ceda9d2e4ddc22e89205'
'16d01a820f1ed93ae46194d3d77187adf6fd4e9764fcf99554430e3e2f2af4cc2b6f7918f595febd3c5e6a380bbfb930bb47a3dd2ba93c60b2ca1f874f264fee'
'722770a6c30ccf75c73ae9be19655cdff00561c62bf15b619dfa618cdd636e97aaf5a6aca1297add4e6a54274cd49e81781d98a59986526d0077a6c64855562d'
diff --git a/metals-client.sh b/metals-client.sh
index 10c337eae9d9..dc430645679a 100755
--- a/metals-client.sh
+++ b/metals-client.sh
@@ -56,6 +56,9 @@ function main {
build_cp
+ # Echo out the full path to the Java binary we will use.
+ echo "Java binary selected: $(command -v java)"
+
# Java options taken from metals-emacs documentation
# https://scalameta.org/metals/docs/editors/emacs.HTML
exec java -XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m -Dmetals.client="$_METALS_CLIENT" -cp "$_CP" scala.meta.metals.Main "$@"