From a529f0d6aebec229516ce849863bb8c3a3f998d1 Mon Sep 17 00:00:00 2001 From: Mitsuo Heijo Date: Fri, 31 Jan 2020 00:06:49 +0900 Subject: fix shellcheck issues, format bash scripts with shfmt --- .editorconfig | 2 + .shellcheckrc | 1 + installer/install-analysis-server-dart-snapshot.sh | 2 +- installer/install-bash-language-server.sh | 2 +- installer/install-clangd.sh | 90 +++++++++++----------- installer/install-cobol-language-support.sh | 6 +- installer/install-css-languageserver.sh | 2 +- installer/install-docker-langserver.sh | 2 +- installer/install-eclipse-jdt-ls.sh | 16 ++-- installer/install-efm-langserver.sh | 2 +- installer/install-elixir-ls.sh | 2 +- installer/install-elm-language-server.sh | 2 +- installer/install-emmylua-ls.sh | 2 +- installer/install-fortls.sh | 2 +- installer/install-fsautocomplete.sh | 15 ++-- installer/install-fsharp-language-server.sh | 2 +- installer/install-gopls.sh | 2 +- installer/install-gql-language-server.sh | 2 +- installer/install-html-languageserver.sh | 2 +- installer/install-intelephense.sh | 2 +- installer/install-javascript-typescript-stdio.sh | 2 +- installer/install-json-languageserver.sh | 2 +- installer/install-kotlin-language-server.sh | 3 +- installer/install-omnisharp-lsp.sh | 6 +- installer/install-pyls-ms.sh | 2 +- installer/install-pyls.sh | 2 +- installer/install-ra_lsp_server.sh | 16 ++-- installer/install-solargraph.sh | 2 +- installer/install-sql-language-server.sh | 2 +- installer/install-texlab.sh | 6 +- installer/install-typescript-language-server.sh | 4 +- installer/install-vim-language-server.sh | 2 +- installer/install-vls.sh | 2 +- installer/install-yaml-language-server.sh | 2 +- 34 files changed, 107 insertions(+), 104 deletions(-) create mode 100644 .shellcheckrc diff --git a/.editorconfig b/.editorconfig index 06f8939..a11e8ec 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,6 +7,8 @@ charset = utf-8 # Extension [*.sh] end_of_line = lf +indent_style = space +indent_size = 2 [*.cmd] end_of_line = crlf diff --git a/.shellcheckrc b/.shellcheckrc new file mode 100644 index 0000000..6eccb2a --- /dev/null +++ b/.shellcheckrc @@ -0,0 +1 @@ +disable=SC2002 diff --git a/installer/install-analysis-server-dart-snapshot.sh b/installer/install-analysis-server-dart-snapshot.sh index 59ae196..bbe09fc 100755 --- a/installer/install-analysis-server-dart-snapshot.sh +++ b/installer/install-analysis-server-dart-snapshot.sh @@ -6,7 +6,7 @@ curl -o "dartsdk-linux-x64-release.zip" "https://storage.googleapis.com/dart-arc unzip "dartsdk-linux-x64-release.zip" rm "dartsdk-linux-x64-release.zip" -cat < analysis-server-dart-snapshot +cat <analysis-server-dart-snapshot #!/usr/bin/env bash DIR=\$(cd \$(dirname \$0); pwd) diff --git a/installer/install-bash-language-server.sh b/installer/install-bash-language-server.sh index 9ec63fa..73fae67 100755 --- a/installer/install-bash-language-server.sh +++ b/installer/install-bash-language-server.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" bash-language-server bash-language-server +"$(dirname "$0")/npm_install.sh" bash-language-server bash-language-server diff --git a/installer/install-clangd.sh b/installer/install-clangd.sh index 0e7818c..ddb235f 100755 --- a/installer/install-clangd.sh +++ b/installer/install-clangd.sh @@ -5,68 +5,66 @@ set -e os=$(uname -s | tr "[:upper:]" "[:lower:]") case $os in - linux) - platform="pc-linux-gnu" - ;; - darwin) - platform="darwin-apple" - ;; +linux) + platform="pc-linux-gnu" + ;; +darwin) + platform="darwin-apple" + ;; esac -if which lsb_release 2> /dev/null; then - distributor_id=$(lsb_release -a 2>&1 | grep 'Distributor ID' | awk '{print $3}') +if command -v lsb_release 2>/dev/null; then + distributor_id=$(lsb_release -a 2>&1 | grep 'Distributor ID' | awk '{print $3}') elif [ -e /etc/fedora-release ]; then - distributor_id="Fedora" + distributor_id="Fedora" elif [ -e /etc/redhat-release ]; then - distributor_id=$(cat /etc/redhat-release | cut -d ' ' -f 1) + distributor_id=$(cat /etc/redhat-release | cut -d ' ' -f 1) elif [ -e /etc/arch-release ]; then - distributor_id="Arch" + distributor_id="Arch" elif [ -e /etc/SuSE-release ]; then - distributor_id="SUSE" + distributor_id="SUSE" elif [ -e /etc/mandriva-release ]; then - distributor_id="Mandriva" + distributor_id="Mandriva" elif [ -e /etc/vine-release ]; then - distributor_id="Vine" + distributor_id="Vine" elif [ -e /etc/gentoo-release ]; then - distributor_id="Gentoo" + distributor_id="Gentoo" else - distributor_id="Unkown" + distributor_id="Unkown" fi case $distributor_id in - # Check Ubuntu version - Ubuntu) - ubuntu_version=$(lsb_release -a 2>&1 | grep 'Release' | awk '{print $2}') - case $ubuntu_version in - 14.04|16.04|18.04) - platform="linux-gnu-ubuntu-$ubuntu_version" - ;; - esac - ;; - # Check LinuxMint version - LinuxMint) - linuxmint_version=$(lsb_release -a 2>&1 | grep 'Release' | awk '{print $2}') - case $linuxmint_version in - 19|19.1|19.2|19.3) - platform="linux-gnu-ubuntu-18.04" - ;; - 18|18.1|18.2|18.3) - platform="linux-gnu-ubuntu-16.04" - ;; - esac - ;; - # Check RedHat OS version - Fedora|Oracle|CentOS) - platform="linux-sles11.3" - ;; +# Check Ubuntu version +Ubuntu) + ubuntu_version=$(lsb_release -a 2>&1 | grep 'Release' | awk '{print $2}') + case $ubuntu_version in + 14.04 | 16.04 | 18.04) + platform="linux-gnu-ubuntu-$ubuntu_version" + ;; + esac + ;; +# Check LinuxMint version +LinuxMint) + linuxmint_version=$(lsb_release -a 2>&1 | grep 'Release' | awk '{print $2}') + case $linuxmint_version in + 19 | 19.1 | 19.2 | 19.3) + platform="linux-gnu-ubuntu-18.04" + ;; + 18 | 18.1 | 18.2 | 18.3) + platform="linux-gnu-ubuntu-16.04" + ;; + esac + ;; +# Check RedHat OS version +Fedora | Oracle | CentOS) + platform="linux-sles11.3" + ;; esac filename="clang+llvm-9.0.0-x86_64-$platform" url="http://releases.llvm.org/9.0.0/$filename.tar.xz" echo "Downloading clangd and LLVM..." -curl -LO "$url" -echo "Extracting archive..." -xzcat $filename.tar.xz | tar x --strip-components=1 $filename/ -rm $filename.tar.xz -ln -sf bin/clangd +echo hello +curl -L "$url" | unxz | tar x --strip-components=1 $filename/ +ln -sf bin/clangd . ./clangd --version diff --git a/installer/install-cobol-language-support.sh b/installer/install-cobol-language-support.sh index 6534e7d..e7a5abc 100755 --- a/installer/install-cobol-language-support.sh +++ b/installer/install-cobol-language-support.sh @@ -4,8 +4,10 @@ set -e version="0.9.1" 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" +filename="cobol-language-support-$version.vsix" +curl -L "$url" -o "$filename" +unzip "$filename" +rm "$filename" cat <./cobol-language-support #!/usr/bin/env bash diff --git a/installer/install-css-languageserver.sh b/installer/install-css-languageserver.sh index 5698a0f..ca51207 100755 --- a/installer/install-css-languageserver.sh +++ b/installer/install-css-languageserver.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" css-languageserver vscode-css-languageserver-bin +"$(dirname "$0")/npm_install.sh" css-languageserver vscode-css-languageserver-bin diff --git a/installer/install-docker-langserver.sh b/installer/install-docker-langserver.sh index b9adbb4..7a68977 100755 --- a/installer/install-docker-langserver.sh +++ b/installer/install-docker-langserver.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" docker-langserver dockerfile-language-server-nodejs +"$(dirname "$0")/npm_install.sh" docker-langserver dockerfile-language-server-nodejs diff --git a/installer/install-eclipse-jdt-ls.sh b/installer/install-eclipse-jdt-ls.sh index 86528d9..cd98dd6 100755 --- a/installer/install-eclipse-jdt-ls.sh +++ b/installer/install-eclipse-jdt-ls.sh @@ -2,19 +2,17 @@ set -e -curl -o jdt-language-server-latest.tar.gz 'http://download.eclipse.org/jdtls/snapshots/jdt-language-server-latest.tar.gz' +curl -L "http://download.eclipse.org/jdtls/snapshots/jdt-language-server-latest.tar.gz" | tar zx curl -o lombok.jar 'https://projectlombok.org/downloads/lombok.jar' -tar xvf jdt-language-server-latest.tar.gz -rm jdt-language-server-latest.tar.gz -osType="\$(uname -s)" -case "\${osType}" in - Darwin*) configDir=config_mac;; - Linux*) configDir=config_linux;; - *) configDir=config_linux +osType="$(uname -s)" +case "${osType}" in +Darwin*) configDir=config_mac ;; +Linux*) configDir=config_linux ;; +*) configDir=config_linux ;; esac -cat < eclipse-jdt-ls +cat <eclipse-jdt-ls #!/usr/bin/env bash DIR=\$(cd \$(dirname \$0); pwd) diff --git a/installer/install-efm-langserver.sh b/installer/install-efm-langserver.sh index a646f03..efad942 100755 --- a/installer/install-efm-langserver.sh +++ b/installer/install-efm-langserver.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/go_install.sh" github.com/mattn/efm-langserver +"$(dirname "$0")/go_install.sh" github.com/mattn/efm-langserver diff --git a/installer/install-elixir-ls.sh b/installer/install-elixir-ls.sh index 3977500..e4c0c74 100755 --- a/installer/install-elixir-ls.sh +++ b/installer/install-elixir-ls.sh @@ -8,7 +8,7 @@ curl -LO "$url" unzip elixir-ls.zip rm elixir-ls.zip -cat < elixir-ls +cat <elixir-ls #!/usr/bin/env bash DIR=\$(cd \$(dirname \$0); pwd) diff --git a/installer/install-elm-language-server.sh b/installer/install-elm-language-server.sh index a5a41ec..2e065e0 100755 --- a/installer/install-elm-language-server.sh +++ b/installer/install-elm-language-server.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" elm-languageserver "@elm-tooling/elm-language-server" +"$(dirname "$0")/npm_install.sh" elm-languageserver "@elm-tooling/elm-language-server" diff --git a/installer/install-emmylua-ls.sh b/installer/install-emmylua-ls.sh index 6af3e76..6e4e59b 100755 --- a/installer/install-emmylua-ls.sh +++ b/installer/install-emmylua-ls.sh @@ -4,7 +4,7 @@ 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 < emmylua-ls +cat <emmylua-ls #!/usr/bin/env bash DIR=\$(cd \$(dirname \$0); pwd) diff --git a/installer/install-fortls.sh b/installer/install-fortls.sh index 9bda54e..9f0b1f1 100755 --- a/installer/install-fortls.sh +++ b/installer/install-fortls.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -"$(dirname $0)/pip_install.sh" fortls fortran-language-server +"$(dirname "$0")/pip_install.sh" fortls fortran-language-server diff --git a/installer/install-fsautocomplete.sh b/installer/install-fsautocomplete.sh index e19d2e8..43827a4 100755 --- a/installer/install-fsautocomplete.sh +++ b/installer/install-fsautocomplete.sh @@ -3,19 +3,20 @@ set -e if command -v dotnet >/dev/null 2>&1; then - echo "dotnet installed" - dotnetcmd=dotnet + echo "dotnet installed" + dotnetcmd=dotnet else - echo "dotnet not found, installing..." - # REF https://github.com/neovim/nvim-lsp/blob/master/lua/nvim_lsp/pyls_ms.lua - curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -i "./.dotnet" - dotnetcmd="\\$DIR/.dotnet/dotnet" + echo "dotnet not found, installing..." + # REF https://github.com/neovim/nvim-lsp/blob/master/lua/nvim_lsp/pyls_ms.lua + curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -i "./.dotnet" + dotnetcmd="\\$DIR/.dotnet/dotnet" fi url="https://ci.appveyor.com/api/projects/fsautocomplete/fsautocomplete/artifacts/bin/pkgs/fsautocomplete.netcore.zip?branch=master" zip=fsautocomplete.zip curl -L "$url" -o "$zip" -unzip -o -d "fsautocomplete.netcore" "$zip" +unzip -o -d "fsautocomplete.netcore" "$zip" +rm "$zip" cat <fsautocomplete #!/bin/sh diff --git a/installer/install-fsharp-language-server.sh b/installer/install-fsharp-language-server.sh index fb606e0..b3d83b9 100755 --- a/installer/install-fsharp-language-server.sh +++ b/installer/install-fsharp-language-server.sh @@ -6,7 +6,7 @@ git clone https://github.com/fsprojects/fsharp-language-server . npm install dotnet build -c Release -cat < fsharp-language-server +cat <fsharp-language-server #!/usr/bin/env bash DIR=\$(cd \$(dirname \$0); pwd) diff --git a/installer/install-gopls.sh b/installer/install-gopls.sh index 17978a4..31c2838 100755 --- a/installer/install-gopls.sh +++ b/installer/install-gopls.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/go_install.sh" golang.org/x/tools/gopls@latest +"$(dirname "$0")/go_install.sh" golang.org/x/tools/gopls@latest diff --git a/installer/install-gql-language-server.sh b/installer/install-gql-language-server.sh index c4e70d4..366364b 100755 --- a/installer/install-gql-language-server.sh +++ b/installer/install-gql-language-server.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" gql-language-server @playlyfe/gql-language-server +"$(dirname "$0")/npm_install.sh" gql-language-server @playlyfe/gql-language-server diff --git a/installer/install-html-languageserver.sh b/installer/install-html-languageserver.sh index 88bf80c..f71f194 100755 --- a/installer/install-html-languageserver.sh +++ b/installer/install-html-languageserver.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" html-languageserver vscode-html-languageserver-bin +"$(dirname "$0")/npm_install.sh" html-languageserver vscode-html-languageserver-bin diff --git a/installer/install-intelephense.sh b/installer/install-intelephense.sh index 170b714..7a8eaec 100755 --- a/installer/install-intelephense.sh +++ b/installer/install-intelephense.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" intelephense intelephense +"$(dirname "$0")/npm_install.sh" intelephense intelephense diff --git a/installer/install-javascript-typescript-stdio.sh b/installer/install-javascript-typescript-stdio.sh index 26a2d4f..824b37d 100755 --- a/installer/install-javascript-typescript-stdio.sh +++ b/installer/install-javascript-typescript-stdio.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" javascript-typescript-stdio javascript-typescript-langserver +"$(dirname "$0")/npm_install.sh" javascript-typescript-stdio javascript-typescript-langserver diff --git a/installer/install-json-languageserver.sh b/installer/install-json-languageserver.sh index 6569bbf..97e2961 100755 --- a/installer/install-json-languageserver.sh +++ b/installer/install-json-languageserver.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" json-languageserver vscode-json-languageserver-bin +"$(dirname "$0")/npm_install.sh" json-languageserver vscode-json-languageserver-bin diff --git a/installer/install-kotlin-language-server.sh b/installer/install-kotlin-language-server.sh index 345676f..1d3b973 100755 --- a/installer/install-kotlin-language-server.sh +++ b/installer/install-kotlin-language-server.sh @@ -2,7 +2,8 @@ set -e -curl -L -o server.zip 'https://github.com/fwcd/kotlin-language-server/releases/download/0.5.2/server.zip' +version="0.5.2" +curl -L -o server.zip "https://github.com/fwcd/kotlin-language-server/releases/download/$version/server.zip" unzip server.zip rm server.zip diff --git a/installer/install-omnisharp-lsp.sh b/installer/install-omnisharp-lsp.sh index 5261293..df1d574 100755 --- a/installer/install-omnisharp-lsp.sh +++ b/installer/install-omnisharp-lsp.sh @@ -19,13 +19,11 @@ esac version="v1.34.9" url="https://github.com/OmniSharp/omnisharp-roslyn/releases/download/$version/omnisharp-$os$arch.tar.gz" -curl -LO "$url" -tar xzvf omnisharp-$os$arch.tar.gz -rm omnisharp-$os$arch.tar.gz +curl -L "$url" | tar xz chmod +x run -cat < omnisharp-lsp +cat <omnisharp-lsp #!/usr/bin/env bash DIR=\$(cd \$(dirname \$0); pwd) diff --git a/installer/install-pyls-ms.sh b/installer/install-pyls-ms.sh index 7ce9b48..87e5a82 100755 --- a/installer/install-pyls-ms.sh +++ b/installer/install-pyls-ms.sh @@ -17,7 +17,7 @@ darwin) *) ;; esac -version="0.5.10" +version="0.5.30" url="https://pvsc.azureedge.net/python-language-server-stable/Python-Language-Server-${system}-x64.${version}.nupkg" nupkg="./pyls.nupkg" diff --git a/installer/install-pyls.sh b/installer/install-pyls.sh index 2db5319..e20e222 100755 --- a/installer/install-pyls.sh +++ b/installer/install-pyls.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/pip_install.sh" pyls python-language-server +"$(dirname "$0")/pip_install.sh" pyls python-language-server diff --git a/installer/install-ra_lsp_server.sh b/installer/install-ra_lsp_server.sh index 17ea397..7b5ad9a 100755 --- a/installer/install-ra_lsp_server.sh +++ b/installer/install-ra_lsp_server.sh @@ -5,14 +5,16 @@ set -e os=$(uname -s | tr "[:upper:]" "[:lower:]") case $os in - linux) - platform="linux" - ;; - darwin) - platform="mac" - ;; +linux) + platform="linux" + ;; +darwin) + platform="mac" + ;; esac -curl -L -o ra_lsp_server-$platform "https://github.com/rust-analyzer/rust-analyzer/releases/download/2020-01-27/ra_lsp_server-$platform" +version="2020-01-29" +curl -L -o ra_lsp_server-$platform "https://github.com/rust-analyzer/rust-analyzer/releases/download/$version/ra_lsp_server-$platform" mv ra_lsp_server-$platform ra_lsp_server +chmod +x ra_lsp_server diff --git a/installer/install-solargraph.sh b/installer/install-solargraph.sh index 3c9f528..df8cd7d 100755 --- a/installer/install-solargraph.sh +++ b/installer/install-solargraph.sh @@ -5,7 +5,7 @@ set -e git clone "https://github.com/castwide/solargraph" . bundle install --path vendor/bundle -cat < solargraph +cat <solargraph #!/usr/bin/env bash DIR=\$(cd \$(dirname \$0); pwd) diff --git a/installer/install-sql-language-server.sh b/installer/install-sql-language-server.sh index d2070d3..0594d48 100755 --- a/installer/install-sql-language-server.sh +++ b/installer/install-sql-language-server.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" sql-language-server sql-language-server +"$(dirname "$0")/npm_install.sh" sql-language-server sql-language-server diff --git a/installer/install-texlab.sh b/installer/install-texlab.sh index 3807c08..ed6b4d6 100755 --- a/installer/install-texlab.sh +++ b/installer/install-texlab.sh @@ -15,6 +15,6 @@ darwin) ;; esac -url="https://github.com/latex-lsp/texlab/releases/download/v1.8.0/texlab-x86_64-$os.tar.gz" -curl -LO "$url" -tar xzvf texlab-x86_64-$os.tar.gz +version="v1.8.0" +url="https://github.com/latex-lsp/texlab/releases/download/$version/texlab-x86_64-$os.tar.gz" +curl -L "$url" | tar xzv diff --git a/installer/install-typescript-language-server.sh b/installer/install-typescript-language-server.sh index 178451a..5098e73 100755 --- a/installer/install-typescript-language-server.sh +++ b/installer/install-typescript-language-server.sh @@ -2,5 +2,5 @@ set -e -"$(dirname $0)/npm_install.sh" tsserver typescript -"$(dirname $0)/npm_install.sh" typescript-language-server typescript-language-server +"$(dirname "$0")/npm_install.sh" tsserver typescript +"$(dirname "$0")/npm_install.sh" typescript-language-server typescript-language-server diff --git a/installer/install-vim-language-server.sh b/installer/install-vim-language-server.sh index d7748b6..e6c931e 100755 --- a/installer/install-vim-language-server.sh +++ b/installer/install-vim-language-server.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" vim-language-server vim-language-server +"$(dirname "$0")/npm_install.sh" vim-language-server vim-language-server diff --git a/installer/install-vls.sh b/installer/install-vls.sh index f3b523b..d524c41 100755 --- a/installer/install-vls.sh +++ b/installer/install-vls.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" vls vue-language-server +"$(dirname "$0")/npm_install.sh" vls vue-language-server diff --git a/installer/install-yaml-language-server.sh b/installer/install-yaml-language-server.sh index f971bc8..e04de55 100755 --- a/installer/install-yaml-language-server.sh +++ b/installer/install-yaml-language-server.sh @@ -2,4 +2,4 @@ set -e -"$(dirname $0)/npm_install.sh" yaml-language-server yaml-language-server +"$(dirname "$0")/npm_install.sh" yaml-language-server yaml-language-server -- cgit v1.2.3-54-g00ecf