From 0ac1019486335473700fba3dd7c91e03f4464b75 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Wed, 20 Nov 2019 15:19:14 -0800 Subject: [PATCH] Update language server install to fix pip and add rustfmt --- install-language-servers.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install-language-servers.sh b/install-language-servers.sh index ed277f8..9329945 100755 --- a/install-language-servers.sh +++ b/install-language-servers.sh @@ -1,6 +1,9 @@ #! /bin/bash set -e +# Clear explicit PYTHONPATH since this gets confused between py2 and py3 +export PYTHONPATH="" + # Determines if a command exists or not function command_exist() { command -v "$1" > /dev/null 2>&1; @@ -10,6 +13,7 @@ function command_exist() { function maybe_run() { if command_exist "$1" ;then echo "> $*" + # shellcheck disable=2048,2086 eval $* else echo "ERROR: $1 does not exist. Could not run $*" @@ -31,7 +35,7 @@ function install_language_servers() { maybe_run pip3 install --user python-language-server # Rust - maybe_run rustup component add rls rust-analysis rust-src + maybe_run rustup component add rls rustfmt rust-analysis rust-src echo "" }