From 42ab14c2cb59c46bcac0ed8dcd1a185dde17764b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 10:50:06 -0800 Subject: [PATCH 01/21] Add initial atom.exe wrapper --- resources/win/atom.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 resources/win/atom.js diff --git a/resources/win/atom.js b/resources/win/atom.js new file mode 100644 index 000000000..bb7bf1f44 --- /dev/null +++ b/resources/win/atom.js @@ -0,0 +1,7 @@ +var spawn = require('child_process').spawn; + +var options = { + detached: true, + stdio: 'ignore' +} +spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", [], options); From 2a80762d5b46303f893ec2807ce8c7b27c101ea4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 10:53:42 -0800 Subject: [PATCH 02/21] Disconnect spawned process --- resources/win/atom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/win/atom.js b/resources/win/atom.js index bb7bf1f44..2c96ede9e 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -4,4 +4,4 @@ var options = { detached: true, stdio: 'ignore' } -spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", [], options); +spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", [], options).disconnect(); From 47aa269de5d7d884b5c4bf0da074d7939b3f8d3a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 10:53:57 -0800 Subject: [PATCH 03/21] Exit main process --- resources/win/atom.js | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/win/atom.js b/resources/win/atom.js index 2c96ede9e..6ca6d61a8 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -5,3 +5,4 @@ var options = { stdio: 'ignore' } spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", [], options).disconnect(); +process.exit(); From d306876229762952d0cb745f531e4de0ab5b5b03 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 10:54:27 -0800 Subject: [PATCH 04/21] Remove disconnect call --- resources/win/atom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/win/atom.js b/resources/win/atom.js index 6ca6d61a8..c60b378ea 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -4,5 +4,5 @@ var options = { detached: true, stdio: 'ignore' } -spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", [], options).disconnect(); +spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", [], options); process.exit(); From 330592e2bdd8cae278b2ac428481e3523f612189 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 10:56:36 -0800 Subject: [PATCH 05/21] Add atom.cmd --- resources/win/atom.cmd | 0 resources/win/atom.js | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 resources/win/atom.cmd diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd new file mode 100644 index 000000000..e69de29bb diff --git a/resources/win/atom.js b/resources/win/atom.js index c60b378ea..dce5c235d 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -4,5 +4,7 @@ var options = { detached: true, stdio: 'ignore' } + +console.log(process.argv); spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", [], options); process.exit(); From 4225c25ad7cf9791c001ff1f4bc7eef0a67a0c98 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 10:57:53 -0800 Subject: [PATCH 06/21] Add initial atom.cmd --- resources/win/atom.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index e69de29bb..06a30e0b2 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -0,0 +1,2 @@ +@echo off +node "%~dp0\\atom.js" %* From 35f49be82a0feb523a6d4ab45fda665ca72f3a3b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 10:59:14 -0800 Subject: [PATCH 07/21] Pass through arguments --- resources/win/atom.cmd | 2 +- resources/win/atom.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index 06a30e0b2..22909d2bc 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -1,2 +1,2 @@ @echo off -node "%~dp0\\atom.js" %* +node "%~dp0\\atom.js" %* --executed-from=%CD% diff --git a/resources/win/atom.js b/resources/win/atom.js index dce5c235d..248444f03 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -5,6 +5,7 @@ var options = { stdio: 'ignore' } -console.log(process.argv); -spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", [], options); -process.exit(); +var args = process.argv.slice(2); +console.log(args); +spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", args, options); +process.exit(0); From 100a1f57647f7277cf12712c9d1d560c3e746ade Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 11:16:17 -0800 Subject: [PATCH 08/21] Parse output flags in atom.cmd --- resources/win/atom.cmd | 20 +++++++++++++++++++- resources/win/atom.js | 12 ++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index 22909d2bc..56f7c5125 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -1,2 +1,20 @@ @echo off -node "%~dp0\\atom.js" %* --executed-from=%CD% + +SET EXPECTOUTPUT= + +FOR %%a IN (%*) DO ( + IF /I "%%a"=="-h" SET EXPECTOUTPUT=YES + IF /I "%%a"=="--help" SET EXPECTOUTPUT=YES + IF /I "%%a"=="-v" SET EXPECTOUTPUT=YES + IF /I "%%a"=="--version" SET EXPECTOUTPUT=YES + IF /I "%%a"=="-f" SET EXPECTOUTPUT=YES + IF /I "%%a"=="--foreground" SET EXPECTOUTPUT=YES + IF /I "%%a"=="-w" SET EXPECTOUTPUT=YES + IF /I "%%a"=="--wait" SET EXPECTOUTPUT=YES +) + +IF "%EXPECTOUTPUT%"=="YES" ( + "C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe" %* +) ELSE ( + node "%~dp0\\atom.js" "C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe" %* --executed-from=%CD% +) diff --git a/resources/win/atom.js b/resources/win/atom.js index 248444f03..324044a82 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -1,11 +1,7 @@ var spawn = require('child_process').spawn; -var options = { - detached: true, - stdio: 'ignore' -} - -var args = process.argv.slice(2); -console.log(args); -spawn("C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe", args, options); +var atomCommandPath = process.argv[2]; +var arguments = process.argv.slice(3); +var options = {detached: true, stdio: 'ignore'}; +spawn(atomCommandPath, arguments, options); process.exit(0); From 690ece3a9e275114864076df84a61c87ba1097ad Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 11:18:05 -0800 Subject: [PATCH 09/21] Remove escaped slashes --- resources/win/atom.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index 56f7c5125..55e02d63d 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -14,7 +14,7 @@ FOR %%a IN (%*) DO ( ) IF "%EXPECTOUTPUT%"=="YES" ( - "C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe" %* + "C:\Users\kevin\AppData\Local\atom\app-0.156.0\atom.exe" %* ) ELSE ( - node "%~dp0\\atom.js" "C:\\Users\\kevin\\AppData\\Local\\atom\\app-0.156.0\\atom.exe" %* --executed-from=%CD% + node "%~dp0\atom.js" "C:\Users\kevin\AppData\Local\atom\app-0.156.0\atom.exe" %* --executed-from=%CD% ) From 1d0dd86041e93dd3e0c53b3f119c18ff842264d7 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 11:51:17 -0800 Subject: [PATCH 10/21] Use new atom.cmd wrapper from installer --- build/tasks/build-task.coffee | 6 ++---- resources/win/atom.cmd | 27 +++++++++++++++------------ src/browser/squirrel-update.coffee | 5 +++-- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index c606220ad..e3b063141 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -149,10 +149,8 @@ module.exports = (grunt) -> grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename)) if process.platform is 'win32' - # Set up chocolatey ignore and gui files - fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), '' - fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), '' - fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), '' + cp path.join('win', 'resources', 'atom.cmd'), path.join(shellAppDir, 'cli', 'atom.cmd') + cp path.join('win', 'resources', 'atom.js'), path.join(shellAppDir, 'cli', 'atom.js') dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug'] dependencies.push('copy-info-plist') if process.platform is 'darwin' diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index 55e02d63d..443e104b7 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -1,20 +1,23 @@ @echo off -SET EXPECTOUTPUT= +SET EXPECT_OUTPUT= FOR %%a IN (%*) DO ( - IF /I "%%a"=="-h" SET EXPECTOUTPUT=YES - IF /I "%%a"=="--help" SET EXPECTOUTPUT=YES - IF /I "%%a"=="-v" SET EXPECTOUTPUT=YES - IF /I "%%a"=="--version" SET EXPECTOUTPUT=YES - IF /I "%%a"=="-f" SET EXPECTOUTPUT=YES - IF /I "%%a"=="--foreground" SET EXPECTOUTPUT=YES - IF /I "%%a"=="-w" SET EXPECTOUTPUT=YES - IF /I "%%a"=="--wait" SET EXPECTOUTPUT=YES + IF /I "%%a"=="-h" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="--help" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="-v" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="--version" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="-f" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="--foreground" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="-w" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="--wait" SET EXPECT_OUTPUT=YES ) -IF "%EXPECTOUTPUT%"=="YES" ( - "C:\Users\kevin\AppData\Local\atom\app-0.156.0\atom.exe" %* +SET ATOM_COMMAND="%~dp0\..\atom.exe" +SET NODE_COMMAND="%~dp0\..\resources\app\apm\node_modules\atom-package-manager\bin\node.exe" + +IF "%EXPECT_OUTPUT%"=="YES" ( + "%ATOM_COMMAND%" %* ) ELSE ( - node "%~dp0\atom.js" "C:\Users\kevin\AppData\Local\atom\app-0.156.0\atom.exe" %* --executed-from=%CD% + "%NODE_COMMAND%" "%~dp0\atom.js" "%ATOM_COMMAND%" %* --executed-from=%CD% ) diff --git a/src/browser/squirrel-update.coffee b/src/browser/squirrel-update.coffee index e976b15bb..24f11f722 100644 --- a/src/browser/squirrel-update.coffee +++ b/src/browser/squirrel-update.coffee @@ -3,7 +3,8 @@ ChildProcess = require 'child_process' fs = require 'fs-plus' path = require 'path' -rootAtomFolder = path.resolve(process.execPath, '..', '..') +appFolder = path.resolve(process.execPath, '..') +rootAtomFolder = path.resolve(appFolder, '..') binFolder = path.join(rootAtomFolder, 'bin') updateDotExe = path.join(rootAtomFolder, 'Update.exe') exeName = path.basename(process.execPath) @@ -111,7 +112,7 @@ uninstallContextMenu = (callback) -> addCommandsToPath = (callback) -> installCommands = (callback) -> atomCommandPath = path.join(binFolder, 'atom.cmd') - relativeExePath = path.relative(binFolder, process.execPath) + relativeCmdPath = path.relative(binFolder, path.join(appFolder, 'cli', 'atom.cmd')) atomCommand = """ @echo off "%~dp0\\#{relativeExePath}" %* From a7f30c63cb7315d6d872649921df4d02945aaa40 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 11:56:25 -0800 Subject: [PATCH 11/21] Don't bundle atom.sh on Windows --- build/tasks/build-task.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index e3b063141..1f3a947a4 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -21,7 +21,9 @@ module.exports = (grunt) -> mkdir appDir - cp 'atom.sh', path.join(appDir, 'atom.sh') + if process.platform isnt 'win32' + cp 'atom.sh', path.join(appDir, 'atom.sh') + cp 'package.json', path.join(appDir, 'package.json') packageDirectories = [] From cad8afe78bf9fb99683937ef182ecfb6d9c78f56 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 12:01:49 -0800 Subject: [PATCH 12/21] Use correct resources path --- build/tasks/build-task.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index 1f3a947a4..5589efbda 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -151,8 +151,8 @@ module.exports = (grunt) -> grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename)) if process.platform is 'win32' - cp path.join('win', 'resources', 'atom.cmd'), path.join(shellAppDir, 'cli', 'atom.cmd') - cp path.join('win', 'resources', 'atom.js'), path.join(shellAppDir, 'cli', 'atom.js') + cp path.join('resources', 'win', 'atom.cmd'), path.join(shellAppDir, 'cli', 'atom.cmd') + cp path.join('resources', 'win', 'atom.js'), path.join(shellAppDir, 'cli', 'atom.js') dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug'] dependencies.push('copy-info-plist') if process.platform is 'darwin' From d3e53c5ada90609d1149363cb95849e29cfb48fa Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 12:30:22 -0800 Subject: [PATCH 13/21] Use correct path variable --- src/browser/squirrel-update.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browser/squirrel-update.coffee b/src/browser/squirrel-update.coffee index 24f11f722..c451967b9 100644 --- a/src/browser/squirrel-update.coffee +++ b/src/browser/squirrel-update.coffee @@ -112,10 +112,10 @@ uninstallContextMenu = (callback) -> addCommandsToPath = (callback) -> installCommands = (callback) -> atomCommandPath = path.join(binFolder, 'atom.cmd') - relativeCmdPath = path.relative(binFolder, path.join(appFolder, 'cli', 'atom.cmd')) + relativeAtomPath = path.relative(binFolder, path.join(appFolder, 'cli', 'atom.cmd')) atomCommand = """ @echo off - "%~dp0\\#{relativeExePath}" %* + "%~dp0\\#{relativeAtomPath}" %* """ apmCommandPath = path.join(binFolder, 'apm.cmd') From bac9eac1fc18e6c65795fe3ae850151f6d09f1d1 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 12:38:02 -0800 Subject: [PATCH 14/21] Resolve atom path and executed-from in atom.js --- resources/win/atom.cmd | 7 ++----- resources/win/atom.js | 6 ++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index 443e104b7..cf86eb91f 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -13,11 +13,8 @@ FOR %%a IN (%*) DO ( IF /I "%%a"=="--wait" SET EXPECT_OUTPUT=YES ) -SET ATOM_COMMAND="%~dp0\..\atom.exe" -SET NODE_COMMAND="%~dp0\..\resources\app\apm\node_modules\atom-package-manager\bin\node.exe" - IF "%EXPECT_OUTPUT%"=="YES" ( - "%ATOM_COMMAND%" %* + "%~dp0\..\atom.exe" %* ) ELSE ( - "%NODE_COMMAND%" "%~dp0\atom.js" "%ATOM_COMMAND%" %* --executed-from=%CD% + "%~dp0\..\resources\app\apm\node_modules\atom-package-manager\bin\node.exe" "%~dp0\atom.js" %* ) diff --git a/resources/win/atom.js b/resources/win/atom.js index 324044a82..d885bad04 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -1,7 +1,9 @@ +var path = require('path'); var spawn = require('child_process').spawn; -var atomCommandPath = process.argv[2]; -var arguments = process.argv.slice(3); +var atomCommandPath = path.resolve(__dirname, '..', 'atom.exe'); +var arguments = process.argv.slice(2); +arguments.push('--executed-from', process.cwd()); var options = {detached: true, stdio: 'ignore'}; spawn(atomCommandPath, arguments, options); process.exit(0); From 3dced04aabd84c5930c96d5ea1baa72537110af8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 12:49:09 -0800 Subject: [PATCH 15/21] Add -t and --test to expected output args --- resources/win/atom.cmd | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index cf86eb91f..2202a8f38 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -3,12 +3,14 @@ SET EXPECT_OUTPUT= FOR %%a IN (%*) DO ( - IF /I "%%a"=="-h" SET EXPECT_OUTPUT=YES - IF /I "%%a"=="--help" SET EXPECT_OUTPUT=YES - IF /I "%%a"=="-v" SET EXPECT_OUTPUT=YES - IF /I "%%a"=="--version" SET EXPECT_OUTPUT=YES IF /I "%%a"=="-f" SET EXPECT_OUTPUT=YES IF /I "%%a"=="--foreground" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="-h" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="--help" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="-t" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="--test" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="-v" SET EXPECT_OUTPUT=YES + IF /I "%%a"=="--version" SET EXPECT_OUTPUT=YES IF /I "%%a"=="-w" SET EXPECT_OUTPUT=YES IF /I "%%a"=="--wait" SET EXPECT_OUTPUT=YES ) From 8f77d65aabe505b0550ef058bf079871bbfe12a5 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 11 Dec 2014 12:54:25 -0800 Subject: [PATCH 16/21] Add --executed-from as first argument --- resources/win/atom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/win/atom.js b/resources/win/atom.js index d885bad04..e1da9b428 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -3,7 +3,7 @@ var spawn = require('child_process').spawn; var atomCommandPath = path.resolve(__dirname, '..', 'atom.exe'); var arguments = process.argv.slice(2); -arguments.push('--executed-from', process.cwd()); +arguments.unshift('--executed-from', process.cwd()); var options = {detached: true, stdio: 'ignore'}; spawn(atomCommandPath, arguments, options); process.exit(0); From f91741eec1b50d2aa98f50c47a256ac4ba6ab00f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 12 Dec 2014 09:51:33 -0800 Subject: [PATCH 17/21] Install cli folder to resources directory --- build/tasks/build-task.coffee | 4 ++-- resources/win/atom.cmd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index 5589efbda..5ffdf6ce2 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -151,8 +151,8 @@ module.exports = (grunt) -> grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename)) if process.platform is 'win32' - cp path.join('resources', 'win', 'atom.cmd'), path.join(shellAppDir, 'cli', 'atom.cmd') - cp path.join('resources', 'win', 'atom.js'), path.join(shellAppDir, 'cli', 'atom.js') + cp path.join('resources', 'win', 'atom.cmd'), path.join(shellAppDir, 'resources', 'cli', 'atom.cmd') + cp path.join('resources', 'win', 'atom.js'), path.join(shellAppDir, 'resources', 'cli', 'atom.js') dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug'] dependencies.push('copy-info-plist') if process.platform is 'darwin' diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index 2202a8f38..61830cb57 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -18,5 +18,5 @@ FOR %%a IN (%*) DO ( IF "%EXPECT_OUTPUT%"=="YES" ( "%~dp0\..\atom.exe" %* ) ELSE ( - "%~dp0\..\resources\app\apm\node_modules\atom-package-manager\bin\node.exe" "%~dp0\atom.js" %* + "%~dp0\..\app\apm\node_modules\atom-package-manager\bin\node.exe" "%~dp0\atom.js" %* ) From 3cf104444c6ca7e635cb87f523d303285be6ae63 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 12 Dec 2014 10:41:22 -0800 Subject: [PATCH 18/21] Add missing resources segment --- src/browser/squirrel-update.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/squirrel-update.coffee b/src/browser/squirrel-update.coffee index c451967b9..f2e53a40e 100644 --- a/src/browser/squirrel-update.coffee +++ b/src/browser/squirrel-update.coffee @@ -112,7 +112,7 @@ uninstallContextMenu = (callback) -> addCommandsToPath = (callback) -> installCommands = (callback) -> atomCommandPath = path.join(binFolder, 'atom.cmd') - relativeAtomPath = path.relative(binFolder, path.join(appFolder, 'cli', 'atom.cmd')) + relativeAtomPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'atom.cmd')) atomCommand = """ @echo off "%~dp0\\#{relativeAtomPath}" %* From 9d3aaad3946ad509822d57afd71177d3d21871d4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 12 Dec 2014 10:51:22 -0800 Subject: [PATCH 19/21] atom.exe is now up on more directory --- resources/win/atom.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd index 61830cb57..029763c52 100644 --- a/resources/win/atom.cmd +++ b/resources/win/atom.cmd @@ -16,7 +16,7 @@ FOR %%a IN (%*) DO ( ) IF "%EXPECT_OUTPUT%"=="YES" ( - "%~dp0\..\atom.exe" %* + "%~dp0\..\..\atom.exe" %* ) ELSE ( "%~dp0\..\app\apm\node_modules\atom-package-manager\bin\node.exe" "%~dp0\atom.js" %* ) From 43de383b142166abb7f300ca5f9d5955c11270d1 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 12 Dec 2014 10:52:48 -0800 Subject: [PATCH 20/21] Use \r\n line endings for cmd shims --- src/browser/squirrel-update.coffee | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/browser/squirrel-update.coffee b/src/browser/squirrel-update.coffee index f2e53a40e..93e0c464d 100644 --- a/src/browser/squirrel-update.coffee +++ b/src/browser/squirrel-update.coffee @@ -113,17 +113,11 @@ addCommandsToPath = (callback) -> installCommands = (callback) -> atomCommandPath = path.join(binFolder, 'atom.cmd') relativeAtomPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'atom.cmd')) - atomCommand = """ - @echo off - "%~dp0\\#{relativeAtomPath}" %* - """ + atomCommand = "@echo off\r\n\"%~dp0\\#{relativeAtomPath}\" %*" apmCommandPath = path.join(binFolder, 'apm.cmd') relativeApmPath = path.relative(binFolder, path.join(process.resourcesPath, 'app', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm.cmd')) - apmCommand = """ - @echo off - "%~dp0\\#{relativeApmPath}" %* - """ + apmCommand = "@echo off\r\n\"%~dp0\\#{relativeApmPath}\" %*" fs.writeFile atomCommandPath, atomCommand, -> fs.writeFile apmCommandPath, apmCommand, -> From eef6532b8c2c6cf6262215341cb4ce87692c911c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 12 Dec 2014 11:08:27 -0800 Subject: [PATCH 21/21] atom.exe is now up one more directory --- resources/win/atom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/win/atom.js b/resources/win/atom.js index e1da9b428..df059aa5b 100644 --- a/resources/win/atom.js +++ b/resources/win/atom.js @@ -1,7 +1,7 @@ var path = require('path'); var spawn = require('child_process').spawn; -var atomCommandPath = path.resolve(__dirname, '..', 'atom.exe'); +var atomCommandPath = path.resolve(__dirname, '..', '..', 'atom.exe'); var arguments = process.argv.slice(2); arguments.unshift('--executed-from', process.cwd()); var options = {detached: true, stdio: 'ignore'};