From e971acd7370154a38a1a2de2584273af6bea16ab Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 15 Mar 2022 17:31:54 +0100
Subject: Code server provide a way to open a default-folder or
 default-workspace. Fixes #143580

---
 scripts/code-server.bat | 9 ++++++---
 scripts/code-server.sh  | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/code-server.bat b/scripts/code-server.bat
index bba4c58d3c1..23006f829ee 100644
--- a/scripts/code-server.bat
+++ b/scripts/code-server.bat
@@ -3,7 +3,9 @@ setlocal
 
 title VSCode Server
 
-pushd %~dp0\..
+set ROOT_DIR=%~dp0..
+
+pushd %ROOT_DIR%
 
 :: Configuration
 set NODE_ENV=development
@@ -20,9 +22,10 @@ if not exist "%NODE%" (
 	call yarn gulp node
 )
 
+popd
+
 :: Launch Server
-call "%NODE%" scripts\code-server.js %*
+call "%NODE%" %ROOT_DIR%\scripts\code-server.js %*
 
-popd
 
 endlocal
diff --git a/scripts/code-server.sh b/scripts/code-server.sh
index 298157e4ee7..bc910a9bb98 100755
--- a/scripts/code-server.sh
+++ b/scripts/code-server.sh
@@ -8,7 +8,7 @@ else
 fi
 
 function code() {
-	cd $ROOT
+	pushd $ROOT
 
 	# Get electron, compile, built-in extensions
 	if [[ -z "${VSCODE_SKIP_PRELAUNCH}" ]]; then
@@ -21,9 +21,11 @@ function code() {
 		yarn gulp node
 	fi
 
+	popd
+
 	NODE_ENV=development \
 	VSCODE_DEV=1 \
-	$NODE ./scripts/code-server.js "$@"
+	$NODE $ROOT/scripts/code-server.js "$@"
 }
 
 code "$@"
-- 
cgit v1.2.3