Merge branch 'master' of https://github.com/mattn/vim-lsp-settings

44 files changed, 56 insertions, 57 deletions

diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim
index 4338eb9..82ba5e6 100644
--- a/autoload/lsp_settings.vim
+++ b/autoload/lsp_settings.vim
@@ -277,8 +277,7 @@ function! s:vim_lsp_install_server(ft, command) abort
     split new
     call termopen(l:entry[1], {'cwd': l:server_install_dir, 'on_exit': function('s:vim_lsp_install_server_post', [l:entry[0]])}) | startinsert
   else
-    let l:args = has('win32') ? ['cmd', '/c', l:entry[1]] : ['bash', '-c', l:entry[1]]
-    let l:bufnr = term_start(l:args, {'cwd': l:server_install_dir})
+    let l:bufnr = term_start(l:entry[1], {'cwd': l:server_install_dir})
     let l:job = term_getjob(l:bufnr)
     if l:job != v:null
       call job_setoptions(l:job, {'exit_cb': function('s:vim_lsp_install_server_post', [l:entry[0]])})
diff --git a/installer/go_install.sh b/installer/go_install.sh
index 5a682a7..d29158e 100755
--- a/installer/go_install.sh
+++ b/installer/go_install.sh
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Usage
 # $ go_install [GO_GET_URLPATH]
 
 set -e
 
-GOPATH=$(pwd) GOBIN=$(pwd) GO111MODULE=on go get -v -up$1
+GOPATH=$(pwd) GOBIN=$(pwd) GO111MODULE=on go get -v -u $1
 rm -rf src
diff --git a/installer/install-analysis-server-dart-snapshot.sh b/installer/install-analysis-server-dart-snapshot.sh
index c38c29d..59ae196 100755
--- a/installer/install-analysis-server-dart-snapshot.sh
+++ b/installer/install-analysis-server-dart-snapshot.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -7,7 +7,7 @@ unzip "dartsdk-linux-x64-release.zip"
 rm "dartsdk-linux-x64-release.zip"
 
 cat <<EOF > analysis-server-dart-snapshot
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 \$DIR/bin/dart \$DIR/bin/snapshots/analysis_server.dart.snapshot --lsp \$*
diff --git a/installer/install-bash-language-server.sh b/installer/install-bash-language-server.sh
index 36c44c6..9ec63fa 100755
--- a/installer/install-bash-language-server.sh
+++ b/installer/install-bash-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-cl-lsp.sh b/installer/install-cl-lsp.sh
index d1311fb..8e7bc4c 100755
--- a/installer/install-cl-lsp.sh
+++ b/installer/install-cl-lsp.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 ros install cxxxr/cl-lsp
diff --git a/installer/install-clangd.sh b/installer/install-clangd.sh
index 4e02204..0e7818c 100755
--- a/installer/install-clangd.sh
+++ b/installer/install-clangd.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-clojure-lsp.sh b/installer/install-clojure-lsp.sh
index 6423e49..9d664ba 100755
--- a/installer/install-clojure-lsp.sh
+++ b/installer/install-clojure-lsp.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-cobol-language-support.sh b/installer/install-cobol-language-support.sh
index a4c209a..6534e7d 100755
--- a/installer/install-cobol-language-support.sh
+++ b/installer/install-cobol-language-support.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -8,7 +8,7 @@ curl -LO "$url"
 unzip "cobol-language-support-$version.vsix"
 
 cat <<EOF >./cobol-language-support
-#!/bin/sh
+#!/usr/bin/env bash
 DIR=\$(cd \$(dirname \$0); pwd)
 java "-Dline.speparator=\r\n" -jar "\$DIR/extension/server/lsp-service-cobol-$version.jar" pipeEnabled
 EOF
diff --git a/installer/install-css-languageserver.sh b/installer/install-css-languageserver.sh
index 923050e..5698a0f 100755
--- a/installer/install-css-languageserver.sh
+++ b/installer/install-css-languageserver.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-dls.sh b/installer/install-dls.sh
index 2dafa3f..2ab50b5 100755
--- a/installer/install-dls.sh
+++ b/installer/install-dls.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-docker-langserver.sh b/installer/install-docker-langserver.sh
index 1ae3970..b9adbb4 100755
--- a/installer/install-docker-langserver.sh
+++ b/installer/install-docker-langserver.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-eclipse-jdt-ls.sh b/installer/install-eclipse-jdt-ls.sh
index fee18e6..7a99874 100755
--- a/installer/install-eclipse-jdt-ls.sh
+++ b/installer/install-eclipse-jdt-ls.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -8,7 +8,7 @@ tar xvf jdt-language-server-latest.tar.gz
 rm jdt-language-server-latest.tar.gz
 
 cat <<EOF > eclipse-jdt-ls
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 LAUNCHER=\$(ls \$DIR/plugins/org.eclipse.equinox.launcher_*.jar)
diff --git a/installer/install-efm-langserver.sh b/installer/install-efm-langserver.sh
index be25db8..a646f03 100755
--- a/installer/install-efm-langserver.sh
+++ b/installer/install-efm-langserver.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-elixir-ls.sh b/installer/install-elixir-ls.sh
index e3209c8..3977500 100755
--- a/installer/install-elixir-ls.sh
+++ b/installer/install-elixir-ls.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -9,7 +9,7 @@ unzip elixir-ls.zip
 rm elixir-ls.zip
 
 cat <<EOF > elixir-ls
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 \$DIR/language_server.sh \$*
diff --git a/installer/install-elm-language-server.sh b/installer/install-elm-language-server.sh
index 0519b21..a5a41ec 100755
--- a/installer/install-elm-language-server.sh
+++ b/installer/install-elm-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-emmylua-ls.sh b/installer/install-emmylua-ls.sh
index c124c77..6af3e76 100755
--- a/installer/install-emmylua-ls.sh
+++ b/installer/install-emmylua-ls.sh
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
 curl -L -o EmmyLua-LS-all.jar 'https://ci.appveyor.com/api/buildjobs/54yf9rjvj49494pd/artifacts/EmmyLua-LS%2Fbuild%2Flibs%2FEmmyLua-LS-all.jar'
 
 cat <<EOF > emmylua-ls
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 java -cp \$DIR/EmmyLua-LS-all.jar com.tang.vscode.MainKt
diff --git a/installer/install-erlang-ls.sh b/installer/install-erlang-ls.sh
index 05ecf5b..274ebe7 100755
--- a/installer/install-erlang-ls.sh
+++ b/installer/install-erlang-ls.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-fortls.sh b/installer/install-fortls.sh
index 1be797b..9bda54e 100755
--- a/installer/install-fortls.sh
+++ b/installer/install-fortls.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 "$(dirname $0)/pip_install.sh" fortls fortran-language-server
diff --git a/installer/install-fsharp-language-server.sh b/installer/install-fsharp-language-server.sh
index 26be8f9..fb606e0 100755
--- a/installer/install-fsharp-language-server.sh
+++ b/installer/install-fsharp-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -7,7 +7,7 @@ npm install
 dotnet build -c Release
 
 cat <<EOF > fsharp-language-server
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 \$DIR/src/FSharpLanguageServer/bin/Release/netcoreapp2.0/FSharpLanguageServer.dll \$*
diff --git a/installer/install-gopls.sh b/installer/install-gopls.sh
index c6cee83..17978a4 100755
--- a/installer/install-gopls.sh
+++ b/installer/install-gopls.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-gql-language-server.sh b/installer/install-gql-language-server.sh
index 9288397..c4e70d4 100755
--- a/installer/install-gql-language-server.sh
+++ b/installer/install-gql-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-groovy-language-server.sh b/installer/install-groovy-language-server.sh
index f9674be..26c70be 100755
--- a/installer/install-groovy-language-server.sh
+++ b/installer/install-groovy-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -6,7 +6,7 @@ git clone --depth=1 https://github.com/prominic/groovy-language-server .
 ./gradlew build
 
 cat <<EOF >groovy-language-server
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 java -jar \$DIR/build/libs/groovy-language-server-all.jar
diff --git a/installer/install-html-languageserver.sh b/installer/install-html-languageserver.sh
index 5e35f5e..88bf80c 100755
--- a/installer/install-html-languageserver.sh
+++ b/installer/install-html-languageserver.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-intelephense.sh b/installer/install-intelephense.sh
index 37621e8..170b714 100755
--- a/installer/install-intelephense.sh
+++ b/installer/install-intelephense.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-javascript-typescript-stdio.sh b/installer/install-javascript-typescript-stdio.sh
index 4f83be6..26a2d4f 100755
--- a/installer/install-javascript-typescript-stdio.sh
+++ b/installer/install-javascript-typescript-stdio.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-json-languageserver.sh b/installer/install-json-languageserver.sh
index ecffa38..6569bbf 100755
--- a/installer/install-json-languageserver.sh
+++ b/installer/install-json-languageserver.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-kotlin-language-server.sh b/installer/install-kotlin-language-server.sh
index 9c208aa..345676f 100755
--- a/installer/install-kotlin-language-server.sh
+++ b/installer/install-kotlin-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-lsp4xml.sh b/installer/install-lsp4xml.sh
index 5cab50c..891e54c 100755
--- a/installer/install-lsp4xml.sh
+++ b/installer/install-lsp4xml.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -8,7 +8,7 @@ url=https://dl.bintray.com/lsp4xml/releases/org/lsp4xml/org.eclipse.lsp4xml/${ve
 curl -LO "$url"
 
 cat <<EOF >lsp4xml
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 java -jar \$DIR/org.eclipse.lsp4xml-${version}-uber.jar
diff --git a/installer/install-metals.sh b/installer/install-metals.sh
index 0bb18f0..c6bdc2d 100755
--- a/installer/install-metals.sh
+++ b/installer/install-metals.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-omnisharp-lsp.sh b/installer/install-omnisharp-lsp.sh
index 7712465..5261293 100755
--- a/installer/install-omnisharp-lsp.sh
+++ b/installer/install-omnisharp-lsp.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -26,7 +26,7 @@ rm omnisharp-$os$arch.tar.gz
 chmod +x run
 
 cat <<EOF > omnisharp-lsp
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 \$DIR/run \$*
diff --git a/installer/install-pyls-ms.sh b/installer/install-pyls-ms.sh
index 41a3346..7ce9b48 100755
--- a/installer/install-pyls-ms.sh
+++ b/installer/install-pyls-ms.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -25,7 +25,7 @@ curl -L "$url" -o "$nupkg"
 unzip "$nupkg"
 
 cat <<EOF >pyls-ms
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 \$DIR/.dotnet/dotnet \$DIR/Microsoft.Python.LanguageServer.dll
diff --git a/installer/install-pyls.sh b/installer/install-pyls.sh
index 7c3f7ee..2db5319 100755
--- a/installer/install-pyls.sh
+++ b/installer/install-pyls.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-ra_lsp_server.sh b/installer/install-ra_lsp_server.sh
index 9e37113..17ea397 100755
--- a/installer/install-ra_lsp_server.sh
+++ b/installer/install-ra_lsp_server.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-reason-language-server.sh b/installer/install-reason-language-server.sh
index f5af8c7..6d4ad55 100755
--- a/installer/install-reason-language-server.sh
+++ b/installer/install-reason-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-solargraph.sh b/installer/install-solargraph.sh
index b6c5066..3c9f528 100755
--- a/installer/install-solargraph.sh
+++ b/installer/install-solargraph.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
@@ -6,7 +6,7 @@ git clone "https://github.com/castwide/solargraph" .
 bundle install --path vendor/bundle
 
 cat <<EOF > solargraph
-#!/bin/sh
+#!/usr/bin/env bash
 
 DIR=\$(cd \$(dirname \$0); pwd)
 cd \$DIR && bundle exec ruby \$DIR/bin/solargraph stdio
diff --git a/installer/install-sql-language-server.sh b/installer/install-sql-language-server.sh
index e4d3586..d2070d3 100755
--- a/installer/install-sql-language-server.sh
+++ b/installer/install-sql-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-terraform-lsp.sh b/installer/install-terraform-lsp.sh
index f3c2d75..05d2eeb 100755
--- a/installer/install-terraform-lsp.sh
+++ b/installer/install-terraform-lsp.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-texlab.sh b/installer/install-texlab.sh
index 0429ae5..3807c08 100755
--- a/installer/install-texlab.sh
+++ b/installer/install-texlab.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-typescript-language-server.sh b/installer/install-typescript-language-server.sh
index e187aa2..178451a 100755
--- a/installer/install-typescript-language-server.sh
+++ b/installer/install-typescript-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-vim-language-server.sh b/installer/install-vim-language-server.sh
index 36e1b67..d7748b6 100755
--- a/installer/install-vim-language-server.sh
+++ b/installer/install-vim-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-vls.sh b/installer/install-vls.sh
index 494e520..f3b523b 100755
--- a/installer/install-vls.sh
+++ b/installer/install-vls.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/install-yaml-language-server.sh b/installer/install-yaml-language-server.sh
index c326cdd..f971bc8 100755
--- a/installer/install-yaml-language-server.sh
+++ b/installer/install-yaml-language-server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/installer/npm_install.sh b/installer/npm_install.sh
index 84073da..1726bef 100755
--- a/installer/npm_install.sh
+++ b/installer/npm_install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Usage
 # $ npm_install [EXECUTABLE_NAME] [NPM_NAME]
diff --git a/installer/pip_install.sh b/installer/pip_install.sh
index 4e3014d..58ff716 100755
--- a/installer/pip_install.sh
+++ b/installer/pip_install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Usage
 # $ pip_install [EXECUTABLE_NAME] [PYPI_NAME]