aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitsuo Heijo <mitsuo.heijo@gmail.com>2020-01-03 13:49:23 +0900
committerMitsuo Heijo <mitsuo.heijo@gmail.com>2020-01-03 13:49:23 +0900
commit6c15c16a88c24a8f2c8e04bd23e34ea367f35608 (patch)
tree2e9ab937b1c03096027ac0cbb2bc755393987a39
parentabc8778a3d4b5bf98a57fc2fea079da63dee561f (diff)
downloadvim-lsp-settings-6c15c16a88c24a8f2c8e04bd23e34ea367f35608.tar.gz
vim-lsp-settings-6c15c16a88c24a8f2c8e04bd23e34ea367f35608.tar.bz2
vim-lsp-settings-6c15c16a88c24a8f2c8e04bd23e34ea367f35608.zip
fix: support multiple npm packages for one language server
-rwxr-xr-xinstaller/npm_install.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/installer/npm_install.sh b/installer/npm_install.sh
index 198666c..84073da 100755
--- a/installer/npm_install.sh
+++ b/installer/npm_install.sh
@@ -5,13 +5,14 @@
set -e
-npm init -y
-
-# Avoid the problem of not being able to install the same package as name in package.json.
-# Create an empty package.json.
-cat <<EOF >package.json
-{"name": ""}
-EOF
+# Supporting multiple npm packages(e.g. typescript-language-server uses typescript-language-server and tsserver).
+# If package.json exists, skip calling npm init.
+if [ ! -f package.json ]; then
+ # Avoid the problem of not being able to install the same package as name in package.json.
+ # Create an empty package.json.
+ npm init -y
+ echo '{"name": ""}' >package.json
+fi
npm install "$2"
ln -s "./node_modules/.bin/$1" .