Use pip_install.sh

15 files changed, 29 insertions, 32 deletions

diff --git a/installer/install-bash-language-server.sh b/installer/install-bash-language-server.sh
index 1b9417c..2cffd6a 100755
--- a/installer/install-bash-language-server.sh
+++ b/installer/install-bash-language-server.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install bash-language-server bash-language-server
+./npm_install.sh bash-language-server bash-language-server
diff --git a/installer/install-css-languageserver.sh b/installer/install-css-languageserver.sh
index c34ad12..93b29c3 100755
--- a/installer/install-css-languageserver.sh
+++ b/installer/install-css-languageserver.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install css-languageserver vscode-css-languageserver-bin
+./npm_install.sh css-languageserver vscode-css-languageserver-bin
diff --git a/installer/install-docker-langserver.sh b/installer/install-docker-langserver.sh
index a756b31..4bfe96e 100755
--- a/installer/install-docker-langserver.sh
+++ b/installer/install-docker-langserver.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install docker-langserver dockerfile-language-server-nodejs
+./npm_install.sh docker-langserver dockerfile-language-server-nodejs
diff --git a/installer/install-elm-language-server.sh b/installer/install-elm-language-server.sh
index 3b6b4df..516426b 100755
--- a/installer/install-elm-language-server.sh
+++ b/installer/install-elm-language-server.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install elm-languageserver "@elm-tooling/elm-language-server"
+./npm_install.sh elm-languageserver "@elm-tooling/elm-language-server"
diff --git a/installer/install-fortls.sh b/installer/install-fortls.sh
index 9685151..b337f68 100755
--- a/installer/install-fortls.sh
+++ b/installer/install-fortls.sh
@@ -2,5 +2,4 @@
 
 cd $(dirname $0)
 
-. ./pip3.sh
-pip_install fortls fortran-language-server
+./pip_install.sh fortls fortran-language-server
diff --git a/installer/install-html-languageserver.sh b/installer/install-html-languageserver.sh
index 3a7f817..386fcb6 100755
--- a/installer/install-html-languageserver.sh
+++ b/installer/install-html-languageserver.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install html-languageserver vscode-html-languageserver-bin
+./npm_install.sh html-languageserver vscode-html-languageserver-bin
diff --git a/installer/install-intelephense.sh b/installer/install-intelephense.sh
index 15c64d6..d26f7d5 100755
--- a/installer/install-intelephense.sh
+++ b/installer/install-intelephense.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install intelephense intelephense
+./npm_install.sh intelephense intelephense
diff --git a/installer/install-javascript-typescript-stdio.sh b/installer/install-javascript-typescript-stdio.sh
index b083671..cbbf068 100755
--- a/installer/install-javascript-typescript-stdio.sh
+++ b/installer/install-javascript-typescript-stdio.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install javascript-typescript-stdio javascript-typescript-langserver
+./npm_install.sh javascript-typescript-stdio javascript-typescript-langserver
diff --git a/installer/install-json-languageserver.sh b/installer/install-json-languageserver.sh
index 74dd9e1..600c3e2 100755
--- a/installer/install-json-languageserver.sh
+++ b/installer/install-json-languageserver.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install json-languageserver vscode-json-languageserver-bin
+./npm_install.sh json-languageserver vscode-json-languageserver-bin
diff --git a/installer/install-pyls.sh b/installer/install-pyls.sh
index fa61803..0c45c37 100755
--- a/installer/install-pyls.sh
+++ b/installer/install-pyls.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./pip3.sh
-pip_install pyls python-language-server
+./pip_install.sh pyls python-language-server
diff --git a/installer/install-typescript-language-server.sh b/installer/install-typescript-language-server.sh
index 4a9a735..fbf7f59 100755
--- a/installer/install-typescript-language-server.sh
+++ b/installer/install-typescript-language-server.sh
@@ -4,5 +4,5 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install tsserver typescript
-./npm_install typescript-language-server typescript-language-server
+./npm_install.sh tsserver typescript
+./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 974e315..7f44c8d 100755
--- a/installer/install-vim-language-server.sh
+++ b/installer/install-vim-language-server.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install vim-language-server vim-language-server
+./npm_install.sh vim-language-server vim-language-server
diff --git a/installer/install-yaml-language-server.sh b/installer/install-yaml-language-server.sh
index 7e46d5d..d62959f 100755
--- a/installer/install-yaml-language-server.sh
+++ b/installer/install-yaml-language-server.sh
@@ -4,4 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-./npm_install yaml-language-server yaml-language-server
+./npm_install.sh yaml-language-server yaml-language-server
diff --git a/installer/pip3.sh b/installer/pip3.sh
deleted file mode 100644
index b309e88..0000000
--- a/installer/pip3.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Usage
-# $ . pip3.sh
-# $ pip_install [EXECUTABLE_NAME] [PYPI_NAME]
-pip_install() {
-  server_dir="../servers/$1"
-  [ -d "$server_dir" ] && rm -rf "$server_dir"
-  mkdir "$server_dir" && cd "$server_dir"
-
-  python3 -m venv ./venv
-  ./venv/bin/pip3 install "$2"
-  ln -s "./venv/bin/$1" .
-}
diff --git a/installer/pip_install.sh b/installer/pip_install.sh
new file mode 100755
index 0000000..60c4df6
--- /dev/null
+++ b/installer/pip_install.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Usage
+# $ . pip3.sh
+# $ pip_install [EXECUTABLE_NAME] [PYPI_NAME]
+
+set -e
+
+server_dir="../servers/$1"
+[ -d "$server_dir" ] && rm -rf "$server_dir"
+mkdir "$server_dir" && cd "$server_dir"
+
+python3 -m venv ./venv
+./venv/bin/pip3 install "$2"
+ln -s "./venv/bin/$1" .