Merge pull request #1 from isomarcte/cleanup-launcher-scripts

Cleanup Launcher Scripts

7 files changed, 73 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39a9eb3e84ff..ed71a5e6a985 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = metals
 	pkgdesc = Language Server For Scala
 	pkgver = 0.5.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://scalameta.org/metals/
 	arch = any
 	license = Apache
@@ -21,46 +21,47 @@ pkgbase = metals
 	source = metals-sublime.sh
 	source = version-fix.patch
 	md5sums = 1893a9e8e8a26431904cced138d8e26d
-	md5sums = d680f9edd2d896048f077cfb8b023ac5
-	md5sums = a883291ea3ae425c2c51b8310c7e4d1b
-	md5sums = dcb3e81e16b90333647d3bc052ce1ece
-	md5sums = b1d64c236e20f91fbbaa06a32dbb72e7
-	md5sums = 2d7e382b962b705bcd5862f7182574fe
+	md5sums = 1edc7a3c2859f1f43030d290fdd14605
+	md5sums = 35d1ad5299a50a57b0e9ce01e8db2621
+	md5sums = b0051c6a23d854d238d8c1537d6d21e9
+	md5sums = d663f1f270728007737fc92eba3cdda6
+	md5sums = 8de373e4b778d505ed7b4013f6de3f7d
 	md5sums = 1228820359ad5d636e56db35349350f4
 	sha1sums = 8370cb58637a47d0640f4f619c95207374cb5eb7
-	sha1sums = dafd89307afc8f75fa6c15903f84e400bf4d69a4
-	sha1sums = 9e0f0f83edd2dacc1053f66297e4f2c16618c48e
-	sha1sums = 214de4e3e38cffce813ba4eafcaf5ca641d95d50
-	sha1sums = f3fd084eee605caa54fdeb3787dab7c359c75e32
-	sha1sums = 42ee89665251bf99935c91283750fe431f7713c4
+	sha1sums = 38c63ddc9a1712faa06082ffa0f62acec9907a12
+	sha1sums = ecbbc90be3f1c928a124369db19a89f58ef24e20
+	sha1sums = 8ff3e8e501179951134c0928fe786cec7b4540f3
+	sha1sums = 980c5f8a923b06f7913e76d373e52f32c6ed5e23
+	sha1sums = 2bac08ea1701ed7ff62a8c7edd0e554a6645ad05
 	sha1sums = feaf909569c00776b67e8d5315332ae3dc02a8b2
 	sha224sums = 24546483700bda5d64cd135bc3d7d53a34b33376ec8a4502c5335385
-	sha224sums = 1638081b5bcca4919152528b1b6a340518fc326ed973e7832c80b41c
-	sha224sums = 4df1908182071dc2359d0ced412c7ab11ee81cd1d2f1039436776e92
-	sha224sums = c78851f0f0f1839563ae32e9b9bfa1221165e93050036a52017a5fd9
-	sha224sums = 909f6b8caecfcb587c982e55f4ded982a8cb7493e79b621bb6dc9b34
-	sha224sums = d4ae4cba4aaa5d2ad1baf45d7a4aa4dce894569ca5fba5e9d63f2a95
+	sha224sums = 3ada0159bda461f0d690fd3a04e19273c5bf6b719a5bc5a7f5ed57dc
+	sha224sums = 21773611c91f73cdf2571f77bf88826bd146e99acd5be4d407e8d8ab
+	sha224sums = 212589cddda77208afed3ce3e5d637b7371de29678a5b4268b8813ba
+	sha224sums = 3bd9d54fa01af4ee558440c15825e4a3f4e0cd23e2c625f415b887c7
+	sha224sums = c2aa07b9a5183f5c2838edb170c9e8ebeac3c82ed2ea5f63e6b39889
 	sha224sums = 702ee997e46be69bca262c1be3867203ccb4454df859b8b9ca323d74
 	sha256sums = 57f61352e382cef8c53a674307fcc8aab1d2b44719831830a9d899dbf14f197c
-	sha256sums = 1277ef9c0cefdb769cfb4e6182a8aa55542cae9604b8f8f3dc98c909d8160572
-	sha256sums = f8f895cb11d0b9af2b5320acf5862fb878f3ba94324bca35278b8aa31b32020c
-	sha256sums = 351f317247124f1ba05680520ca6cacb9c8ed9259d50505aa5127018bcad620d
-	sha256sums = a60cfc3f0fc6fde8309ee7cd9c4a2bdf58668314cee8bdbc7938809e3de4e6c4
-	sha256sums = 1f587cc96100d560a43da35127ed1b5d2e36d14211f20e7931029abcab64d430
+	sha256sums = 428d5e71f6bee7e8cd522bb5978ca0df9f0099b9554e97398945fa122f8d3b01
+	sha256sums = 477e4e3cb1a1b20afaec654a837bbe15a3269bc7dd657ff5832187104463fbfa
+	sha256sums = 5cd20fa0cd8cd12faa08caca4a4b871b378e8a1694399656a15ca4694ada9f2c
+	sha256sums = 95a05219364440e488f12c173da3516e20ccf4ca4076cdaa1eb3c7b0bf813270
+	sha256sums = cb350148b06cc3ee283b456488d8af9613e07305f3ae4032874c6a1b9f73fa8f
 	sha256sums = 510bab61855505e4e301f98c2b44259964803ced3799fb9fb3d5bc180ba765f9
 	sha384sums = 871a1da43a17de6a7251c0c7c1ae19bf6aa85f293249674ffa535803a75bfcc14714cf19fc6ea0956bdb00f94332517d
-	sha384sums = 090dce5f166dd210e22ded19eb0150cb35c390d07f2b93bb824cf4fadf4c188788246c264a59aab2f908258f81c0389d
-	sha384sums = ae8b87a65ee897708134374f976d6b704d48f1f525e036de12cc793ab6960d2bcc176a57be886b0204ddba7c94b93214
-	sha384sums = 5c7aa52760f882910dca99f046c1b4384d36e72b40709a513345087ade967a0668a1b003e23320c57200fefb65772016
-	sha384sums = 71326bea2d7905bce5a1a4a495108af53b06cc162c86da46a62e85666ce7a78b25e7258219dc953da08743d050e86a60
-	sha384sums = 1235abb496221584c8b11b987460c7683ab160210b86d7a5acf117ad9c3315733795bc10af73844f731c20f1c25c64c7
+	sha384sums = 27d5b5e691813140340e18f1468c301747b91aa721f7434c3c898b92d3ee81ccf686eb45373ab68db440aa9f0b32a749
+	sha384sums = 43ba683998bbf95934c930ce8e120072ecaba251ba0ece24e9eeff7aa5d9b7d9af6aecac3645f8381252f1c0055ec67f
+	sha384sums = d2cba883c4a9cebb0676583dd62f7870ac73d264ba96b74419f510e528c0f9268ab62356165c74f361078fe507098613
+	sha384sums = c99e9d2000c8201de9d608903406214e0d2ad27ee52ff083e5b28b79c83ade7aca79e80a592438fdf1aab179968d6cbe
+	sha384sums = be07a2f5bad7a95502126ab453821a916ec88c3af1513a3840f2a4306bd7f3eac741f1b065adab9bb2bb23e849f77981
 	sha384sums = 24ae61e7e62d5b2944093cc1273b9be3a813db436ffe44769e5dbe0dc37f085492950389e0324285bd149c4d818f79ca
 	sha512sums = 21d6bd645ad35b749374b76015e7019375e2723b4e4e1b25dc0a983591f475c5466f1b6840a90b8dcd582e870a25f7d8296c04da8ec6e780512f0a5b53c6dd5c
-	sha512sums = 6cad8b806c5111604381d8ce760db9da8afd46312b8916678af65ace65e531b402e481e457bb7265bc3a3699f08b612b7b231755934af9bd7ee221b902e0dcd7
-	sha512sums = 95232be1232d3189a82cc0fe6af1d00fffd8334908e6d166143c69c0eda8e3a24674ce06d85e36213bc6a7044ae2f6a76d94a0715852aaf78b205a08112b403a
-	sha512sums = 1f1b034051fb65170bfd3f33cb8eb8a2f75018c1d32ef3a404e876427c3c94dd3beeb17d050a3898e803ad1f789b1b6f8258c0e81b4688b4fc17eb8d8f977522
-	sha512sums = 70a0cc5eb6b9a3b64a056524a1187626628e248f9fe419b00aaa1d665af482aa18c6e1c84570b1d1d196f0b143f2ccf91f26bc0c332e8f46120ce1cd5d68b676
-	sha512sums = 485f0360f0a25de9e397e44a987fdb2c5872de62568215f225572d0d0607dcab1ceb15d350b917c27c822caf89bdb24abf1433240ceca25867e0a6696d41f240
+	sha512sums = c04c63c959bdab9dc9fefd278a750e08757661bbdf685a078ffd7b7804c1b1c05988aa17fe8d00cd616bc5ff54c137b8774bda66e644c3a385d5950125ce278a
+	sha512sums = 255ac4d9856eed88a6c1b7bcdc51a6e3b434718754b4476e474eac5e3298be65ad1385672132fcb128402e912a2c792438e23323fbf9a2cfa0d282f105105567
+	sha512sums = 8d12ffc5eed49fdc8b16682843377f06955d22dddfb72de814237cfdcf7ca6a42e622c3cfd9d0a9f0fd4f46a4c1f05c7bcb69541e9fcb4f8ba16915d19b523f8
+	sha512sums = 62702baaffd37a562649032d6cc45756a1829876e4b812815483e704457fcefb19849aa5977d729d572c22592da04e87e1e2effa295b797603535527046d1c7a
+	sha512sums = 15d663103edfca27d517c8161914074e4d90fbb069bbf692c1e68d39d9a8157c5878dcd6926481841b732cf4eb3299c42789aef1fe5ec2442aaeba7cf29d185f
 	sha512sums = b4a4eb0bde4045de411b639e16cf41b95e3e50d8950c3a48008d42b60751541e4957c463f4f817320f15488c702d52fb977d3fe63d8832d55f259907f7e0afcf
 
 pkgname = metals
+
diff --git a/PKGBUILD b/PKGBUILD
index 62533017af0f..33f9f9100935 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=4
+pkgrel=5
 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'
-         'd680f9edd2d896048f077cfb8b023ac5'
-         'a883291ea3ae425c2c51b8310c7e4d1b'
-         'dcb3e81e16b90333647d3bc052ce1ece'
-         'b1d64c236e20f91fbbaa06a32dbb72e7'
-         '2d7e382b962b705bcd5862f7182574fe'
+         '1edc7a3c2859f1f43030d290fdd14605'
+         '35d1ad5299a50a57b0e9ce01e8db2621'
+         'b0051c6a23d854d238d8c1537d6d21e9'
+         'd663f1f270728007737fc92eba3cdda6'
+         '8de373e4b778d505ed7b4013f6de3f7d'
          '1228820359ad5d636e56db35349350f4')
 sha1sums=('8370cb58637a47d0640f4f619c95207374cb5eb7'
-          'dafd89307afc8f75fa6c15903f84e400bf4d69a4'
-          '9e0f0f83edd2dacc1053f66297e4f2c16618c48e'
-          '214de4e3e38cffce813ba4eafcaf5ca641d95d50'
-          'f3fd084eee605caa54fdeb3787dab7c359c75e32'
-          '42ee89665251bf99935c91283750fe431f7713c4'
+          '38c63ddc9a1712faa06082ffa0f62acec9907a12'
+          'ecbbc90be3f1c928a124369db19a89f58ef24e20'
+          '8ff3e8e501179951134c0928fe786cec7b4540f3'
+          '980c5f8a923b06f7913e76d373e52f32c6ed5e23'
+          '2bac08ea1701ed7ff62a8c7edd0e554a6645ad05'
           'feaf909569c00776b67e8d5315332ae3dc02a8b2')
 sha224sums=('24546483700bda5d64cd135bc3d7d53a34b33376ec8a4502c5335385'
-            '1638081b5bcca4919152528b1b6a340518fc326ed973e7832c80b41c'
-            '4df1908182071dc2359d0ced412c7ab11ee81cd1d2f1039436776e92'
-            'c78851f0f0f1839563ae32e9b9bfa1221165e93050036a52017a5fd9'
-            '909f6b8caecfcb587c982e55f4ded982a8cb7493e79b621bb6dc9b34'
-            'd4ae4cba4aaa5d2ad1baf45d7a4aa4dce894569ca5fba5e9d63f2a95'
+            '3ada0159bda461f0d690fd3a04e19273c5bf6b719a5bc5a7f5ed57dc'
+            '21773611c91f73cdf2571f77bf88826bd146e99acd5be4d407e8d8ab'
+            '212589cddda77208afed3ce3e5d637b7371de29678a5b4268b8813ba'
+            '3bd9d54fa01af4ee558440c15825e4a3f4e0cd23e2c625f415b887c7'
+            'c2aa07b9a5183f5c2838edb170c9e8ebeac3c82ed2ea5f63e6b39889'
             '702ee997e46be69bca262c1be3867203ccb4454df859b8b9ca323d74')
 sha256sums=('57f61352e382cef8c53a674307fcc8aab1d2b44719831830a9d899dbf14f197c'
-            '1277ef9c0cefdb769cfb4e6182a8aa55542cae9604b8f8f3dc98c909d8160572'
-            'f8f895cb11d0b9af2b5320acf5862fb878f3ba94324bca35278b8aa31b32020c'
-            '351f317247124f1ba05680520ca6cacb9c8ed9259d50505aa5127018bcad620d'
-            'a60cfc3f0fc6fde8309ee7cd9c4a2bdf58668314cee8bdbc7938809e3de4e6c4'
-            '1f587cc96100d560a43da35127ed1b5d2e36d14211f20e7931029abcab64d430'
+            '428d5e71f6bee7e8cd522bb5978ca0df9f0099b9554e97398945fa122f8d3b01'
+            '477e4e3cb1a1b20afaec654a837bbe15a3269bc7dd657ff5832187104463fbfa'
+            '5cd20fa0cd8cd12faa08caca4a4b871b378e8a1694399656a15ca4694ada9f2c'
+            '95a05219364440e488f12c173da3516e20ccf4ca4076cdaa1eb3c7b0bf813270'
+            'cb350148b06cc3ee283b456488d8af9613e07305f3ae4032874c6a1b9f73fa8f'
             '510bab61855505e4e301f98c2b44259964803ced3799fb9fb3d5bc180ba765f9')
 sha384sums=('871a1da43a17de6a7251c0c7c1ae19bf6aa85f293249674ffa535803a75bfcc14714cf19fc6ea0956bdb00f94332517d'
-            '090dce5f166dd210e22ded19eb0150cb35c390d07f2b93bb824cf4fadf4c188788246c264a59aab2f908258f81c0389d'
-            'ae8b87a65ee897708134374f976d6b704d48f1f525e036de12cc793ab6960d2bcc176a57be886b0204ddba7c94b93214'
-            '5c7aa52760f882910dca99f046c1b4384d36e72b40709a513345087ade967a0668a1b003e23320c57200fefb65772016'
-            '71326bea2d7905bce5a1a4a495108af53b06cc162c86da46a62e85666ce7a78b25e7258219dc953da08743d050e86a60'
-            '1235abb496221584c8b11b987460c7683ab160210b86d7a5acf117ad9c3315733795bc10af73844f731c20f1c25c64c7'
+            '27d5b5e691813140340e18f1468c301747b91aa721f7434c3c898b92d3ee81ccf686eb45373ab68db440aa9f0b32a749'
+            '43ba683998bbf95934c930ce8e120072ecaba251ba0ece24e9eeff7aa5d9b7d9af6aecac3645f8381252f1c0055ec67f'
+            'd2cba883c4a9cebb0676583dd62f7870ac73d264ba96b74419f510e528c0f9268ab62356165c74f361078fe507098613'
+            'c99e9d2000c8201de9d608903406214e0d2ad27ee52ff083e5b28b79c83ade7aca79e80a592438fdf1aab179968d6cbe'
+            'be07a2f5bad7a95502126ab453821a916ec88c3af1513a3840f2a4306bd7f3eac741f1b065adab9bb2bb23e849f77981'
             '24ae61e7e62d5b2944093cc1273b9be3a813db436ffe44769e5dbe0dc37f085492950389e0324285bd149c4d818f79ca')
 sha512sums=('21d6bd645ad35b749374b76015e7019375e2723b4e4e1b25dc0a983591f475c5466f1b6840a90b8dcd582e870a25f7d8296c04da8ec6e780512f0a5b53c6dd5c'
-            '6cad8b806c5111604381d8ce760db9da8afd46312b8916678af65ace65e531b402e481e457bb7265bc3a3699f08b612b7b231755934af9bd7ee221b902e0dcd7'
-            '95232be1232d3189a82cc0fe6af1d00fffd8334908e6d166143c69c0eda8e3a24674ce06d85e36213bc6a7044ae2f6a76d94a0715852aaf78b205a08112b403a'
-            '1f1b034051fb65170bfd3f33cb8eb8a2f75018c1d32ef3a404e876427c3c94dd3beeb17d050a3898e803ad1f789b1b6f8258c0e81b4688b4fc17eb8d8f977522'
-            '70a0cc5eb6b9a3b64a056524a1187626628e248f9fe419b00aaa1d665af482aa18c6e1c84570b1d1d196f0b143f2ccf91f26bc0c332e8f46120ce1cd5d68b676'
-            '485f0360f0a25de9e397e44a987fdb2c5872de62568215f225572d0d0607dcab1ceb15d350b917c27c822caf89bdb24abf1433240ceca25867e0a6696d41f240'
+            'c04c63c959bdab9dc9fefd278a750e08757661bbdf685a078ffd7b7804c1b1c05988aa17fe8d00cd616bc5ff54c137b8774bda66e644c3a385d5950125ce278a'
+            '255ac4d9856eed88a6c1b7bcdc51a6e3b434718754b4476e474eac5e3298be65ad1385672132fcb128402e912a2c792438e23323fbf9a2cfa0d282f105105567'
+            '8d12ffc5eed49fdc8b16682843377f06955d22dddfb72de814237cfdcf7ca6a42e622c3cfd9d0a9f0fd4f46a4c1f05c7bcb69541e9fcb4f8ba16915d19b523f8'
+            '62702baaffd37a562649032d6cc45756a1829876e4b812815483e704457fcefb19849aa5977d729d572c22592da04e87e1e2effa295b797603535527046d1c7a'
+            '15d663103edfca27d517c8161914074e4d90fbb069bbf692c1e68d39d9a8157c5878dcd6926481841b732cf4eb3299c42789aef1fe5ec2442aaeba7cf29d185f'
             'b4a4eb0bde4045de411b639e16cf41b95e3e50d8950c3a48008d42b60751541e4957c463f4f817320f15488c702d52fb977d3fe63d8832d55f259907f7e0afcf')
 validpgpkeys=()
 
diff --git a/metals-client.sh b/metals-client.sh
index 7dc9ee7cdb4a..594fbd5080ef 100755
--- a/metals-client.sh
+++ b/metals-client.sh
@@ -3,13 +3,13 @@
 set -e
 
 declare -r _INSTALL_DIR='/usr/share/java/metals'
-declare _CP="${_INSTALL_DIR}/lib:${_INSTALL_DIR}/metals"
+declare _CP="$_INSTALL_DIR/lib:$_INSTALL_DIR/metals"
 
 function build_cp {
-    for name in $(find ${_INSTALL_DIR}/jars -regex '.*\.jar')
+    while read -r name
     do
-        _CP="${name}:${_CP}"
-    done
+        _CP="$name:$_CP"
+    done <<< "$(find "$_INSTALL_DIR"/jars -regex '.*\.jar')"
 }
 
 function main {
@@ -17,7 +17,7 @@ function main {
 
     # 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 $@
+    java -XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m -Dmetals.client="$_METALS_CLIENT" -cp "$_CP" scala.meta.metals.Main "$@"
 }
 
-main $@
+main "$@"
diff --git a/metals-emacs.sh b/metals-emacs.sh
index 5230d48dfc56..f248ea26a4b5 100755
--- a/metals-emacs.sh
+++ b/metals-emacs.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-_METALS_CLIENT=emacs metals-client $@
+_METALS_CLIENT=emacs metals-client "$@"
diff --git a/metals-sublime.sh b/metals-sublime.sh
index 5461b7c11a3d..dd45ec72ddc3 100755
--- a/metals-sublime.sh
+++ b/metals-sublime.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-_METALS_CLIENT=sublime metals-client $@
+_METALS_CLIENT=sublime metals-client "$@"
diff --git a/metals-vim.sh b/metals-vim.sh
index 5cf5af575510..b1aa813880bb 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 metals-client "$@"
diff --git a/metals-vscode.sh b/metals-vscode.sh
index 0fc8ca0953dc..25eff6765652 100755
--- a/metals-vscode.sh
+++ b/metals-vscode.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-_METALS_CLIENT=vscode metals-client $@
+_METALS_CLIENT=vscode metals-client "$@"