run npm install on scripts/code

#22
microsoft · Nov 26, 2015 · 4a85ac5 · 4a85ac5
1 parent b845a93
commit 4a85ac5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 14 deletions.
diff --git a/scripts/code.bat b/scripts/code.bat
@@ -1,12 +1,20 @@
 @echo off
 title VSCode Dev
 
+pushd %~dp0\..
+
+:: Node modules
+if not exist node_modules call .\scripts\npm.bat install
+
+:: Get electron
+node .\node_modules\gulp\bin\gulp.js electron
+
+:: Configuration
 set NODE_ENV=development
 set VSCODE_DEV=1
 set ELECTRON_ENABLE_LOGGING=1
 set ELECTRON_ENABLE_STACK_DUMPING=1
 
-pushd %~dp0\..
-node .\node_modules\gulp\bin\gulp.js electron
+:: Launch Code
 .\.build\electron\CodeOSS.exe . %*
 popd
diff --git a/scripts/code.sh b/scripts/code.sh
@@ -7,17 +7,27 @@ else
 	ROOT=$(dirname $(dirname $(readlink -f $0)))
 fi
 
-# Configuration
-export NODE_ENV=development
-export VSCODE_DEV=1
-export ELECTRON_ENABLE_LOGGING=1
-export ELECTRON_ENABLE_STACK_DUMPING=1
+function code() {
+	cd $ROOT
 
-# Prepare
-cd $ROOT ; node node_modules/gulp/bin/gulp.js electron
+	# Node modules
+	test -d node_modules || ./scripts/npm.sh install
 
-if [[ "$OSTYPE" == "darwin"* ]]; then
-	cd $ROOT; ./.build/electron/Electron.app/Contents/MacOS/Electron . $*
-else
-	cd $ROOT; ./.build/electron/electron . $*
-fi
+	# Get electron
+	node node_modules/gulp/bin/gulp.js electron
+
+	# Configuration
+	export NODE_ENV=development
+	export VSCODE_DEV=1
+	export ELECTRON_ENABLE_LOGGING=1
+	export ELECTRON_ENABLE_STACK_DUMPING=1
+
+	# Launch Code
+	if [[ "$OSTYPE" == "darwin"* ]]; then
+		./.build/electron/Electron.app/Contents/MacOS/Electron . $*
+	else
+		./.build/electron/electron . $*
+	fi
+}
+
+code