From 00035055a491040569f2744d1636f6f86161f5e5 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Thu, 25 Feb 2016 17:35:33 +0100
Subject: [PATCH] use same cli script in Windows

fixes #3055
---
 build/gulpfile.vscode.js     | 1 +
 resources/win32/bin/code.cmd | 2 +-
 resources/win32/bin/code.js  | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 resources/win32/bin/code.js

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 95b9b8c4b4d..883d6e83e91 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -233,6 +233,7 @@ function packageTask(platform, arch, opts) {
 			result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32' }));
 
 			result = es.merge(result, gulp.src('resources/win32/bin/code.cmd', { base: 'resources/win32' })
+				.pipe(replace('@@NAME@@', product.nameShort))
 				.pipe(rename(function (f) { f.basename = product.applicationName; })));
 
 			result = es.merge(result, gulp.src('resources/win32/bin/code.sh', { base: 'resources/win32' })
diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd
index 4fe8b88f9d5..a975610eb31 100644
--- a/resources/win32/bin/code.cmd
+++ b/resources/win32/bin/code.cmd
@@ -2,5 +2,5 @@
 setlocal
 set VSCODE_DEV=
 set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
-"%~dp0..\\Code.exe" "%~dp0code.js" %*
+call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\\app\\out\\cli.js" %*
 endlocal
\ No newline at end of file
diff --git a/resources/win32/bin/code.js b/resources/win32/bin/code.js
deleted file mode 100644
index 6dbd04f3e4e..00000000000
--- a/resources/win32/bin/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
-require('child_process').spawn(require('path').resolve(__dirname, '..', 'Code.exe'), process.argv.slice(2), { detached: true, stdio: 'ignore' });
-process.exit(0);
\ No newline at end of file
-- 
GitLab