25 files changed, 281 insertions, 262 deletions
diff --git a/installer/install-bash-language-server.cmd b/installer/install-bash-language-server.cmd
index 0504f39..eef3e5e 100644
--- a/installer/install-bash-language-server.cmd
+++ b/installer/install-bash-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install bash-language-server bash-language-server
+@echo off
+
+cd /d %~dp0
+
+call npm_install bash-language-server bash-language-server
diff --git a/installer/install-clojure-lsp.cmd b/installer/install-clojure-lsp.cmd
index 82e5065..4f667f6 100644
--- a/installer/install-clojure-lsp.cmd
+++ b/installer/install-clojure-lsp.cmd
@@ -1,12 +1,12 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\clojure-lsp
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-curl -L -o clojure-lsp.cmd https://github.com/snoe/clojure-lsp/releases/download/release-20191202T142318/clojure-lsp
+@echo off
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\clojure-lsp
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+curl -L -o clojure-lsp.cmd https://github.com/snoe/clojure-lsp/releases/download/release-20191202T142318/clojure-lsp
diff --git a/installer/install-cobol-language-support.cmd b/installer/install-cobol-language-support.cmd
index e1b6090..76c1a2c 100644
--- a/installer/install-cobol-language-support.cmd
+++ b/installer/install-cobol-language-support.cmd
@@ -1,22 +1,28 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\cobol-language-support
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-set version=0.9.1
-set url=https://github.com/eclipse/che-che4z-lsp-for-cobol/releases/download/%version%/cobol-language-support-%version%.vsix
-curl -LO "%url%"
-unzip "cobol-language-support-%version%.vsix"
-
-echo @echo off ^
-
-java "-Dline.speparator=\r\n" -jar "%%~dp0\extension\server\lsp-service-cobol-%version%.jar" pipeEnabled ^
-
-> cobol-language-support.cmd
-
+@echo off
+
+where unzip1 2>NUL
+if %ERRORLEVEL% neq 0 (
+    echo unzip command required
+    exit /b 1
+)
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\cobol-language-support
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+set version=0.9.1
+set url=https://github.com/eclipse/che-che4z-lsp-for-cobol/releases/download/%version%/cobol-language-support-%version%.vsix
+curl -LO "%url%"
+unzip "cobol-language-support-%version%.vsix"
+
+echo @echo off ^
+
+java "-Dline.speparator=\r\n" -jar "%%~dp0\extension\server\lsp-service-cobol-%version%.jar" pipeEnabled ^
+
+> cobol-language-support.cmd
+
diff --git a/installer/install-css-languageserver.cmd b/installer/install-css-languageserver.cmd
index 64117b9..529bb74 100644
--- a/installer/install-css-languageserver.cmd
+++ b/installer/install-css-languageserver.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install css-languageserver vscode-css-languageserver-bin
+@echo off
+
+cd /d %~dp0
+
+call npm_install css-languageserver vscode-css-languageserver-bin
diff --git a/installer/install-docker-langserver.cmd b/installer/install-docker-langserver.cmd
index 05e9953..d4112c3 100644
--- a/installer/install-docker-langserver.cmd
+++ b/installer/install-docker-langserver.cmd
@@ -1,6 +1,6 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install docker-langserver dockerfile-language-server-nodejs
-
+@echo off
+
+cd /d %~dp0
+
+call npm_install docker-langserver dockerfile-language-server-nodejs
+
diff --git a/installer/install-elm-language-server.cmd b/installer/install-elm-language-server.cmd
index 7390b98..ae36144 100644
--- a/installer/install-elm-language-server.cmd
+++ b/installer/install-elm-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install elm-language-server "@elm-tooling/elm-language-server"
+@echo off
+
+cd /d %~dp0
+
+call npm_install elm-language-server "@elm-tooling/elm-language-server"
diff --git a/installer/install-emmylua-ls.cmd b/installer/install-emmylua-ls.cmd
index ba0f39f..6c74ae1 100644
--- a/installer/install-emmylua-ls.cmd
+++ b/installer/install-emmylua-ls.cmd
@@ -1,19 +1,19 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\emmylua-ls
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-curl -L -o EmmyLua-LS-all.jar "https://ci.appveyor.com/api/buildjobs/54yf9rjvj49494pd/artifacts/EmmyLua-LS%%2Fbuild%%2Flibs%%2FEmmyLua-LS-all.jar"
-
-echo @echo off ^
-
-java -cp %%~dp0/EmmyLua-LS-all.jar com.tang.vscode.MainKt ^
-
-> emmylua-ls.cmd
-
+@echo off
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\emmylua-ls
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+curl -L -o EmmyLua-LS-all.jar "https://ci.appveyor.com/api/buildjobs/54yf9rjvj49494pd/artifacts/EmmyLua-LS%%2Fbuild%%2Flibs%%2FEmmyLua-LS-all.jar"
+
+echo @echo off ^
+
+java -cp %%~dp0/EmmyLua-LS-all.jar com.tang.vscode.MainKt ^
+
+> emmylua-ls.cmd
+
diff --git a/installer/install-fortls.cmd b/installer/install-fortls.cmd
index 20c306b..32251aa 100644
--- a/installer/install-fortls.cmd
+++ b/installer/install-fortls.cmd
@@ -1,6 +1,6 @@
-@echo off
-
-cd /d %~dp0
-
-call pip_install fortls fortran-language-server
-
+@echo off
+
+cd /d %~dp0
+
+call pip_install fortls fortran-language-server
+
diff --git a/installer/install-gopls.cmd b/installer/install-gopls.cmd
index 8289713..9c08e36 100644
--- a/installer/install-gopls.cmd
+++ b/installer/install-gopls.cmd
@@ -1,15 +1,15 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\gopls
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-set GOPATH=%cd%
-set GOBIN=%cd%
-go get -v -u golang.org/x/tools/cmd/gopls
-rd /S /Q "src"
+@echo off
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\gopls
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+set GOPATH=%cd%
+set GOBIN=%cd%
+go get -v -u golang.org/x/tools/cmd/gopls
+rd /S /Q "src"
diff --git a/installer/install-html-languageserver.cmd b/installer/install-html-languageserver.cmd
index 6482513..943ebf5 100644
--- a/installer/install-html-languageserver.cmd
+++ b/installer/install-html-languageserver.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install html-languageserver vscode-json-languageserver-bin
+@echo off
+
+cd /d %~dp0
+
+call npm_install html-languageserver vscode-json-languageserver-bin
diff --git a/installer/install-intelephense.cmd b/installer/install-intelephense.cmd
index b073901..6258852 100644
--- a/installer/install-intelephense.cmd
+++ b/installer/install-intelephense.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install intelephense intelephense
+@echo off
+
+cd /d %~dp0
+
+call npm_install intelephense intelephense
diff --git a/installer/install-javascript-typescript-langserver.cmd b/installer/install-javascript-typescript-langserver.cmd
index d822033..a653ada 100644
--- a/installer/install-javascript-typescript-langserver.cmd
+++ b/installer/install-javascript-typescript-langserver.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install javascript-typescript-langserver javascript-typescript-langserver
+@echo off
+
+cd /d %~dp0
+
+call npm_install javascript-typescript-langserver javascript-typescript-langserver
diff --git a/installer/install-json-languageserver.cmd b/installer/install-json-languageserver.cmd
index d5434f9..06b7bb2 100644
--- a/installer/install-json-languageserver.cmd
+++ b/installer/install-json-languageserver.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install json-languageserver vscode-json-languageserver-bin
+@echo off
+
+cd /d %~dp0
+
+call npm_install json-languageserver vscode-json-languageserver-bin
diff --git a/installer/install-kotlin-language-server.cmd b/installer/install-kotlin-language-server.cmd
index 1a67356..6e5fae5 100644
--- a/installer/install-kotlin-language-server.cmd
+++ b/installer/install-kotlin-language-server.cmd
@@ -1,5 +1,11 @@
 @echo off
 
+where unzip1 2>NUL
+if %ERRORLEVEL% neq 0 (
+    echo unzip command required
+    exit /b 1
+)
+
 setlocal
 
 cd /d %~dp0
diff --git a/installer/install-lsp4xml.cmd b/installer/install-lsp4xml.cmd
index 1ff4b3b..e85b269 100644
--- a/installer/install-lsp4xml.cmd
+++ b/installer/install-lsp4xml.cmd
@@ -1,19 +1,19 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\lsp4xml
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-curl -LO "https://dl.bintray.com/lsp4xml/releases/org/lsp4xml/org.eclipse.lsp4xml/0.9.1/org.eclipse.lsp4xml-0.9.1-uber.jar"
-
-echo @echo off ^
-
-java -jar %%~dp0\org.eclipse.lsp4xml-0.9.1-uber.jar ^
-
-> lsp4xml.cmd
-
+@echo off
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\lsp4xml
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+curl -LO "https://dl.bintray.com/lsp4xml/releases/org/lsp4xml/org.eclipse.lsp4xml/0.9.1/org.eclipse.lsp4xml-0.9.1-uber.jar"
+
+echo @echo off ^
+
+java -jar %%~dp0\org.eclipse.lsp4xml-0.9.1-uber.jar ^
+
+> lsp4xml.cmd
+
diff --git a/installer/install-metals.cmd b/installer/install-metals.cmd
index 294ed2d..decf44c 100644
--- a/installer/install-metals.cmd
+++ b/installer/install-metals.cmd
@@ -1,16 +1,16 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\metals
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-curl -Lo coursier https://git.io/coursier-cli
-curl -Lo coursier.bat https://git.io/coursier-bat
-
-set version="0.7.6"
-java %JAVA_OPTS% -jar coursier bootstrap --ttl Inf "org.scalameta:metals_2.12:%version%" -r "bintray:scalacenter/releases" -r "sonatype:public" -r "sonatype:snapshots" -o metals
+@echo off
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\metals
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+curl -Lo coursier https://git.io/coursier-cli
+curl -Lo coursier.bat https://git.io/coursier-bat
+
+set version="0.7.6"
+java %JAVA_OPTS% -jar coursier bootstrap --ttl Inf "org.scalameta:metals_2.12:%version%" -r "bintray:scalacenter/releases" -r "sonatype:public" -r "sonatype:snapshots" -o metals
diff --git a/installer/install-omnisharp-lsp.cmd b/installer/install-omnisharp-lsp.cmd
index be58203..828a3b0 100644
--- a/installer/install-omnisharp-lsp.cmd
+++ b/installer/install-omnisharp-lsp.cmd
@@ -1,20 +1,27 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\omnisharp-lsp
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-curl -L -o omnisharp-win-x64.zip "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.34.9/omnisharp-win-x64.zip"
-unzip omnisharp-win-x64.zip
-del omnisharp-win-x64.zip
-
-echo @echo off ^
-
-%%~dp0\omnisharp.exe %%* ^
-
-> omnisharp-lsp.cmd
+@echo off
+
+where unzip1 2>NUL
+if %ERRORLEVEL% neq 0 (
+    echo unzip command required
+    exit /b 1
+)
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\omnisharp-lsp
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+curl -L -o omnisharp-win-x64.zip "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.34.9/omnisharp-win-x64.zip"
+unzip omnisharp-win-x64.zip
+del omnisharp-win-x64.zip
+
+echo @echo off ^
+
+%%~dp0\omnisharp.exe %%* ^
+
+> omnisharp-lsp.cmd
+
diff --git a/installer/install-pyls.cmd b/installer/install-pyls.cmd
index 4449ff4..bbdfefd 100644
--- a/installer/install-pyls.cmd
+++ b/installer/install-pyls.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call pip_install pyls python-language-server
+@echo off
+
+cd /d %~dp0
+
+call pip_install pyls python-language-server
diff --git a/installer/install-solargraph.cmd b/installer/install-solargraph.cmd
index 9493e45..fe7f6d8 100644
--- a/installer/install-solargraph.cmd
+++ b/installer/install-solargraph.cmd
@@ -1,21 +1,21 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\solargraph
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-git clone "https://github.com/castwide/solargraph" .
-
-call bundle install --path vendor/bundle
-
-echo @echo off ^
-
-bundle exec ruby %%~dp0\bin/solargraph stdio ^
-
-> solargraph.cmd
-
+@echo off
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\solargraph
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+git clone "https://github.com/castwide/solargraph" .
+
+call bundle install --path vendor/bundle
+
+echo @echo off ^
+
+bundle exec ruby %%~dp0\bin/solargraph stdio ^
+
+> solargraph.cmd
+
diff --git a/installer/install-terraform-lsp.cmd b/installer/install-terraform-lsp.cmd
index afa48f1..3c94999 100644
--- a/installer/install-terraform-lsp.cmd
+++ b/installer/install-terraform-lsp.cmd
@@ -1,12 +1,12 @@
-@echo off
-
-setlocal
-
-cd /d %~dp0
-
-set server_dir=..\servers\terraform-lsp
-if exist %server_dir% rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-curl -L "https://github.com/juliosueiras/terraform-lsp/releases/download/v0.0.9/terraform-lsp_0.0.9_windows_amd64.tar.gz" | tar xz
+@echo off
+
+setlocal
+
+cd /d %~dp0
+
+set server_dir=..\servers\terraform-lsp
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+curl -L "https://github.com/juliosueiras/terraform-lsp/releases/download/v0.0.9/terraform-lsp_0.0.9_windows_amd64.tar.gz" | tar xz
diff --git a/installer/install-typescript-language-server.cmd b/installer/install-typescript-language-server.cmd
index f488f85..8538968 100644
--- a/installer/install-typescript-language-server.cmd
+++ b/installer/install-typescript-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install typescript-language-server typescript-language-server
+@echo off
+
+cd /d %~dp0
+
+call npm_install typescript-language-server typescript-language-server
diff --git a/installer/install-vim-language-server.cmd b/installer/install-vim-language-server.cmd
index 0223980..c2a1d55 100644
--- a/installer/install-vim-language-server.cmd
+++ b/installer/install-vim-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install vim-language-server vim-language-server
+@echo off
+
+cd /d %~dp0
+
+call npm_install vim-language-server vim-language-server
diff --git a/installer/install-yaml-language-server.cmd b/installer/install-yaml-language-server.cmd
index a75f6d0..043e388 100644
--- a/installer/install-yaml-language-server.cmd
+++ b/installer/install-yaml-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd /d %~dp0
-
-call npm_install yaml-language-server yaml-language-server
+@echo off
+
+cd /d %~dp0
+
+call npm_install yaml-language-server yaml-language-server
diff --git a/installer/npm_install.cmd b/installer/npm_install.cmd
index 7d0a122..ecb09da 100644
--- a/installer/npm_install.cmd
+++ b/installer/npm_install.cmd
@@ -1,21 +1,21 @@
-@echo off
-
-if "x%1" equ "x" goto :EOF
-if "x%2" equ "x" goto :EOF
-
-set server_dir=..\servers\%1
-if exist "%server_dir%" rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-call npm init -y
-
-echo {"name":""}>package.json
-
-call npm install "%2"
-
-echo @echo off ^
-
-call %%~dp0\node_modules\.bin\%1.cmd %%* ^
-
-> %1.cmd
+@echo off
+
+if "x%1" equ "x" goto :EOF
+if "x%2" equ "x" goto :EOF
+
+set server_dir=..\servers\%1
+if exist "%server_dir%" rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+call npm init -y
+
+echo {"name":""}>package.json
+
+call npm install "%2"
+
+echo @echo off ^
+
+call %%~dp0\node_modules\.bin\%1.cmd %%* ^
+
+> %1.cmd
diff --git a/installer/pip_install.cmd b/installer/pip_install.cmd
index 3dbaf4f..754679b 100644
--- a/installer/pip_install.cmd
+++ b/installer/pip_install.cmd
@@ -1,18 +1,18 @@
-@echo off
-
-if "x%1" equ "x" goto :EOF
-if "x%2" equ "x" goto :EOF
-
-set server_dir=..\servers\%1
-if exist "%server_dir%" rd /Q /S "%server_dir%"
-md "%server_dir%"
-cd /d "%server_dir%"
-
-python3 -m venv ./venv
-venv\bin\pip3 install %2
-
-echo @echo off ^
-
-%%~dp0\venv\bin\%1.cmd %%* ^
-
-> %1.cmd
+@echo off
+
+if "x%1" equ "x" goto :EOF
+if "x%2" equ "x" goto :EOF
+
+set server_dir=..\servers\%1
+if exist "%server_dir%" rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+python3 -m venv ./venv
+venv\bin\pip3 install %2
+
+echo @echo off ^
+
+%%~dp0\venv\bin\%1.cmd %%* ^
+
+> %1.cmd