From 5c11e83a145cc8977fba63cb0c9b666e1d7317e3 Mon Sep 17 00:00:00 2001
From: wordi <wordijp@gmail.com>
Date: Fri, 27 Dec 2019 15:26:58 +0900
Subject: Keep current directory after execution in npm_install
---
installer/npm.sh | 4 +++-
installer/npm_install.cmd | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
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
--
cgit v1.2.3-54-g00ecf