aboutsummaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2019-12-27 16:04:15 +0900
committerGitHub <noreply@github.com>2019-12-27 16:04:15 +0900
commit8dad706ad6624f895fa54722f277f6a2735e6c5e (patch)
treea1be6a58b292660b79b641041ec9a2d455782c2a /installer
parentfc9e07839ac7dafc8107ccd003f8369ca0198406 (diff)
parent5c11e83a145cc8977fba63cb0c9b666e1d7317e3 (diff)
downloadvim-lsp-settings-8dad706ad6624f895fa54722f277f6a2735e6c5e.tar.gz
vim-lsp-settings-8dad706ad6624f895fa54722f277f6a2735e6c5e.tar.bz2
vim-lsp-settings-8dad706ad6624f895fa54722f277f6a2735e6c5e.zip
Merge pull request #36 from wordijp/feature/keep_current_directory
Keep current directory after execution in npm_install
Diffstat (limited to 'installer')
-rw-r--r--installer/npm.sh4
-rw-r--r--installer/npm_install.cmd2
2 files changed, 5 insertions, 1 deletions
diff --git a/installer/npm.sh b/installer/npm.sh
index c1ec529..19e4e11 100644
--- a/installer/npm.sh
+++ b/installer/npm.sh
@@ -8,7 +8,7 @@ set -e
npm_install() {
server_dir="../servers/$1"
[ -d "$server_dir" ] && rm -rf "$server_dir"
- mkdir "$server_dir" && cd "$server_dir"
+ mkdir "$server_dir" && pushd . > /dev/null && cd "$server_dir"
npm init -y
@@ -20,4 +20,6 @@ EOF
npm install "$2"
ln -s "./node_modules/.bin/$1" .
+
+ popd > /dev/null
}
diff --git a/installer/npm_install.cmd b/installer/npm_install.cmd
index ecb09da..caea4a8 100644
--- a/installer/npm_install.cmd
+++ b/installer/npm_install.cmd
@@ -6,6 +6,7 @@ if "x%2" equ "x" goto :EOF
set server_dir=..\servers\%1
if exist "%server_dir%" rd /Q /S "%server_dir%"
md "%server_dir%"
+pushd .
cd /d "%server_dir%"
call npm init -y
@@ -19,3 +20,4 @@ echo @echo off ^
call %%~dp0\node_modules\.bin\%1.cmd %%* ^
> %1.cmd
+popd