Skip to content
This repository was archived by the owner on May 19, 2020. It is now read-only.

Commit e87fc5a

Browse files
committed
Update patch files
1 parent 26615d3 commit e87fc5a

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
--- auto-update-manager.coffee.orig 2016-02-12 04:59:30.000000000 -0800
2-
+++ auto-update-manager.coffee 2016-02-12 05:08:59.000000000 -0800
3-
@@ -19,7 +19,7 @@
4-
constructor: (@version, @testMode, resourcePath) ->
1+
--- auto-update-manager.coffee.orig 2017-02-02 18:02:30.000000000 +0000
2+
+++ auto-update-manager.coffee 2017-02-02 18:05:22.000000000 +0000
3+
@@ -18,7 +18,7 @@
4+
constructor: (@version, @testMode, resourcePath, @config) ->
55
@state = IdleState
66
@iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
77
- @feedUrl = "https://atom.io/api/updates?version=#{@version}"
88
+ @feedUrl = "https://updates.particle.io?version=#{@version}"
9-
@config = new Config({configDirPath: process.env.ATOM_HOME, resourcePath, enablePersistence: true})
10-
@config.setSchema null, {type: 'object', properties: _.clone(require('../config-schema'))}
11-
@config.load()
9+
process.nextTick => @setupAutoUpdater()
10+
11+
setupAutoUpdater: ->
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
--- codesign-task.coffee.orig 2015-08-07 16:43:11.000000000 +0100
2-
+++ codesign-task.coffee 2015-08-07 16:47:16.000000000 +0100
3-
@@ -17,7 +17,7 @@
4-
grunt.registerTask 'codesign:installer', 'Codesign AtomSetup.exe', ->
5-
done = @async()
6-
cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
7-
- atomSetupExePath = path.resolve(grunt.config.get('atom.buildDir'), 'installer', 'AtomSetup.exe')
8-
+ atomSetupExePath = path.resolve(grunt.config.get('atom.buildDir'), 'installer', 'ParticleDevSetup.exe')
9-
spawn {cmd, args: [atomSetupExePath]}, (error) -> done(error)
10-
11-
grunt.registerTask 'codesign:app', 'Codesign Atom.app', ->
12-
@@ -27,7 +27,7 @@
1+
--- codesign-task.coffee.orig 2017-02-02 17:49:50.000000000 +0000
2+
+++ codesign-task.coffee 2017-02-02 17:56:11.000000000 +0000
3+
@@ -12,7 +12,7 @@
4+
unlockKeychain (error) ->
135
return done(error) if error?
146

15-
cmd = 'codesign'
167
- args = ['--deep', '--force', '--verbose', '--sign', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
178
+ args = ['--deep', '--force', '--verbose', '--sign', 'Developer ID Application: Spark Labs, Inc.', grunt.config.get('atom.shellAppDir')]
18-
spawn {cmd, args}, (error) -> done(error)
9+
spawn {cmd: 'codesign', args: args}, (error) -> done(error)
1910

2011
unlockKeychain = (callback) ->
12+
@@ -33,7 +33,7 @@
13+
14+
grunt.registerTask 'codesign:installer', 'CodeSign Windows installer (AtomSetup.exe)', ->
15+
done = @async()
16+
- atomSetupExePath = path.resolve(grunt.config.get('atom.buildDir'), 'installer', 'AtomSetup.exe')
17+
+ atomSetupExePath = path.resolve(grunt.config.get('atom.buildDir'), 'installer', 'ParticleDevSetup.exe')
18+
signWindowsExecutable atomSetupExePath, (error) -> done(error)
19+
20+
grunt.registerTask 'codesign:installer-deferred', 'Obtain cert and configure installer to perform CodeSign', ->

build/tasks/patches/publish-build-task.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- publish-build-task.coffee.orig 2016-02-11 08:45:44.000000000 -0800
2-
+++ publish-build-task.coffee 2016-02-11 09:24:43.000000000 -0800
3-
@@ -73,13 +73,11 @@
1+
--- publish-build-task.coffee.orig 2017-02-02 17:49:50.000000000 +0000
2+
+++ publish-build-task.coffee 2017-02-02 17:59:25.000000000 +0000
3+
@@ -68,13 +68,11 @@
44
switch process.platform
55
when 'darwin'
66
[
@@ -11,22 +11,22 @@
1111
]
1212
when 'win32'
1313
- assets = [{assetName: 'atom-windows.zip', sourcePath: appName}]
14-
- for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
15-
+ assets = [{assetName: "particle-dev-windows-#{version}.zip", sourcePath: 'ParticleDev'}]
16-
+ for squirrelAsset in ['ParticleDevSetup.exe', 'RELEASES', "particledev-#{version}-full.nupkg", "particledev-#{version}-delta.nupkg"]
14+
- for squirrelAsset in ['AtomSetup.exe', 'AtomSetup.msi', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
15+
+ assets = [{assetName: "particle-dev-windows-#{version}", sourcePath: 'ParticleDev'}]
16+
+ for squirrelAsset in ['ParticleDevSetup.exe', 'ParticleDevSetup.msi', 'RELEASES', "particledev-#{version}-full.nupkg", "particledev-#{version}-delta.nupkg"]
1717
cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset)
1818
assets.push({assetName: squirrelAsset, sourcePath: assetName})
1919
assets
20-
@@ -101,7 +99,7 @@
20+
@@ -96,7 +94,7 @@
2121
arch = 'i386'
2222
else
2323
arch = 'x86_64'
2424
- assetName = "atom.#{arch}.rpm"
2525
+ assetName = "particle-dev.#{arch}.rpm"
2626

2727
cp sourcePath, path.join(buildDir, assetName)
28-
29-
@@ -132,10 +130,10 @@
28+
assets = [{assetName, sourcePath}]
29+
@@ -134,10 +132,10 @@
3030
async.parallel(tasks, callback)
3131

3232
getAtomDraftRelease = (isPrerelease, branchName, callback) ->
@@ -39,7 +39,7 @@
3939
callback(error)
4040
else
4141
[firstDraft] = releases.filter ({draft}) -> draft
42-
@@ -158,7 +156,7 @@
42+
@@ -160,7 +158,7 @@
4343
createAtomDraftRelease = (isPrerelease, branchName, callback) ->
4444
{version} = require('../../package.json')
4545
options =
@@ -48,7 +48,7 @@
4848
method: 'POST'
4949
headers: defaultHeaders
5050
json:
51-
@@ -175,7 +173,7 @@
51+
@@ -177,7 +175,7 @@
5252

5353
request options, (error, response, body='') ->
5454
if error? or response.statusCode isnt 201

0 commit comments

Comments
 (0)