From e5167eb8f253dfd5605cc92a81376610bbc24c19 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Thu, 20 Jan 2022 13:36:46 +0100
Subject: [PATCH] Fix paths on Windows

---
 resources/server/bin-dev/code-server.bat     | 2 +-
 resources/server/bin-dev/helpers/browser.cmd | 2 +-
 resources/server/bin-dev/remote-cli/code.cmd | 2 +-
 resources/server/bin/code-server.cmd         | 2 +-
 resources/server/bin/helpers/browser.cmd     | 2 +-
 resources/server/bin/remote-cli/code.cmd     | 2 +-
 resources/server/bin/server-old.cmd          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/server/bin-dev/code-server.bat b/resources/server/bin-dev/code-server.bat
index d6a61b53267..ac152f65f06 100644
--- a/resources/server/bin-dev/code-server.bat
+++ b/resources/server/bin-dev/code-server.bat
@@ -36,7 +36,7 @@ goto loop1
 
 :after_loop
 
-call "%NODE%" %INSPECT% "out\vs\server\main.js" %RESTVAR%
+call "%NODE%" %INSPECT% "out\server-main.js" %RESTVAR%
 
 popd
 
diff --git a/resources/server/bin-dev/helpers/browser.cmd b/resources/server/bin-dev/helpers/browser.cmd
index 4f195ce7ec8..7a21259de3c 100644
--- a/resources/server/bin-dev/helpers/browser.cmd
+++ b/resources/server/bin-dev/helpers/browser.cmd
@@ -2,5 +2,5 @@
 setlocal
 SET VSCODE_PATH=%~dp0..\..\..\..
 FOR /F "tokens=* USEBACKQ" %%g IN (`where /r "%VSCODE_PATH%\.build\node" node.exe`) do (SET "NODE=%%g")
-call "%NODE%" "%VSCODE_PATH%\out\vs\server\cli.js" "Code Server - Dev" "" "" "code.cmd" "--openExternal" %*
+call "%NODE%" "%VSCODE_PATH%\out\server-cli.js" "Code Server - Dev" "" "" "code.cmd" "--openExternal" %*
 endlocal
diff --git a/resources/server/bin-dev/remote-cli/code.cmd b/resources/server/bin-dev/remote-cli/code.cmd
index 044a63a14a5..fd1d2c5ca49 100644
--- a/resources/server/bin-dev/remote-cli/code.cmd
+++ b/resources/server/bin-dev/remote-cli/code.cmd
@@ -2,5 +2,5 @@
 setlocal
 SET VSCODE_PATH=%~dp0..\..\..\..
 FOR /F "tokens=* USEBACKQ" %%g IN (`where /r "%VSCODE_PATH%\.build\node" node.exe`) do (SET "NODE=%%g")
-call "%NODE%" "%VSCODE_PATH%\out\vs\server\cli.js" "Code Server - Dev" "" "" "code.cmd" %*
+call "%NODE%" "%VSCODE_PATH%\out\server-cli.js" "Code Server - Dev" "" "" "code.cmd" %*
 endlocal
diff --git a/resources/server/bin/code-server.cmd b/resources/server/bin/code-server.cmd
index 57e163af8ce..d2bebf81851 100644
--- a/resources/server/bin/code-server.cmd
+++ b/resources/server/bin/code-server.cmd
@@ -19,6 +19,6 @@ goto loop1
 
 :after_loop
 
-"%ROOT_DIR%\node.exe" %INSPECT% "%ROOT_DIR%\out\vs\server\main.js" %RESTVAR%
+"%ROOT_DIR%\node.exe" %INSPECT% "%ROOT_DIR%\out\server-main.js" %RESTVAR%
 
 endlocal
diff --git a/resources/server/bin/helpers/browser.cmd b/resources/server/bin/helpers/browser.cmd
index 5bf6d0fcb68..ffa6b1cf57d 100644
--- a/resources/server/bin/helpers/browser.cmd
+++ b/resources/server/bin/helpers/browser.cmd
@@ -1,5 +1,5 @@
 @echo off
 setlocal
 set ROOT_DIR=%~dp0..\..
-call "%ROOT_DIR%\node.exe" "%ROOT_DIR%\out\vs\server\cli.js" "@@APPNAME@@" "@@VERSION@@" "@@COMMIT@@" "@@APPNAME@@.cmd" "--openExternal" %*
+call "%ROOT_DIR%\node.exe" "%ROOT_DIR%\out\server-cli.js" "@@APPNAME@@" "@@VERSION@@" "@@COMMIT@@" "@@APPNAME@@.cmd" "--openExternal" %*
 endlocal
diff --git a/resources/server/bin/remote-cli/code.cmd b/resources/server/bin/remote-cli/code.cmd
index a33c6d3cf5c..e69a3117381 100644
--- a/resources/server/bin/remote-cli/code.cmd
+++ b/resources/server/bin/remote-cli/code.cmd
@@ -1,5 +1,5 @@
 @echo off
 setlocal
 set ROOT_DIR=%~dp0..\..
-call "%ROOT_DIR%\node.exe" "%ROOT_DIR%\out\vs\server\cli.js" "@@APPNAME@@" "@@VERSION@@" "@@COMMIT@@" "@@APPNAME@@.cmd" %*
+call "%ROOT_DIR%\node.exe" "%ROOT_DIR%\out\server-cli.js" "@@APPNAME@@" "@@VERSION@@" "@@COMMIT@@" "@@APPNAME@@.cmd" %*
 endlocal
diff --git a/resources/server/bin/server-old.cmd b/resources/server/bin/server-old.cmd
index cdf9e5a552e..3b459b30d37 100644
--- a/resources/server/bin/server-old.cmd
+++ b/resources/server/bin/server-old.cmd
@@ -19,6 +19,6 @@ goto loop1
 
 :after_loop
 
-"%ROOT_DIR%node.exe" %INSPECT% "%ROOT_DIR%out\vs\server\main.js" --compatibility=1.63 %RESTVAR%
+"%ROOT_DIR%node.exe" %INSPECT% "%ROOT_DIR%out\server-main.js" --compatibility=1.63 %RESTVAR%
 
 endlocal