only call yarn gulp node when needed

aeschli · aeschli · commit a447ecc2ea6a · 2022-01-21T15:15:12.000+01:00
diff --git a/code-server.bat b/code-server.bat
@@ -12,11 +12,15 @@ set VSCODE_DEV=1
 :: Sync built-in extensions
 call yarn download-builtin-extensions
 
-:: Download nodejs executable for remote
-call yarn gulp node
+:: Node executable
+FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
+
+if not exist "%NODE%" (
+	:: Download nodejs executable for remote
+	call yarn gulp node
+)
 
 :: Launch Server
-FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
 call "%NODE%" scripts\code-server.js %*
 
 popd
diff --git a/code-server.js b/code-server.js
@@ -31,6 +31,7 @@ if (args.help) {
 		'./scripts/code-server.sh|bat [options]\n' +
 		' --launch              Opens a browser'
 	);
+	// more help options will be printed by startServer
 }
 
 const serverArgs = process.argv.slice(2).filter(v => v !== '--launch');
diff --git a/code-server.sh b/code-server.sh
@@ -13,10 +13,11 @@ function code() {
 	# Sync built-in extensions
 	yarn download-builtin-extensions
 
-	# Load remote node
-	yarn gulp node
-
 	NODE=$(node build/lib/node.js)
+	if [ ! -e $NODE ];then
+		# Load remote node
+		yarn gulp node
+	fi
 
 	NODE_ENV=development \
 	VSCODE_DEV=1 \
diff --git a/code-web.bat b/code-web.bat
@@ -8,11 +8,15 @@ pushd %~dp0\..
 :: Sync built-in extensions
 call yarn download-builtin-extensions
 
-:: Download nodejs executable for remote
-call yarn gulp node
+:: Node executable
+FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
+
+if not exist "%NODE%" (
+	:: Download nodejs executable for remote
+	call yarn gulp node
+)
 
 :: Launch Server
-FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
 call "%NODE%" scripts\code-web.js %*
 
 popd
diff --git a/code-web.sh b/code-web.sh
@@ -13,8 +13,11 @@ function code() {
 	# Sync built-in extensions
 	yarn download-builtin-extensions
 
-	# Load remote node
-	yarn gulp node
+	NODE=$(node build/lib/node.js)
+	if [ ! -e $NODE ];then
+		# Load remote node
+		yarn gulp node
+	fi
 
 	NODE=$(node build/lib/node.js)
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ if (args.help) {`
`31`	`31`	`'./scripts/code-server.sh\|bat [options]\n' +`
`32`	`32`	`' --launch Opens a browser'`
`33`	`33`	`);`
	`34`	`+ // more help options will be printed by startServer`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`const serverArgs = process.argv.slice(2).filter(v => v !== '--launch');`