Merge branch 'master' into as-introduce-editor-update

build/tasks/publish-build-task.coffee

@@ -11,6 +11,7 @@ AWS = require 'aws-sdk'
 grunt = null
 
 token = process.env.ATOM_ACCESS_TOKEN
+repo = process.env.ATOM_REPO ? 'atom/atom'
 defaultHeaders =
   Authorization: "token #{token}"
   'User-Agent': 'Atom'
@@ -119,7 +120,8 @@ logError = (message, error, details) ->
 zipAssets = (buildDir, assets, callback) ->
   zip = (directory, sourcePath, assetName, callback) ->
     if process.platform is 'win32'
-      zipCommand = "C:/psmodules/7z.exe a -r #{assetName} \"#{sourcePath}\""
+      sevenZipPath = if process.env.JANKY_SHA1? then "C:/psmodules/" else ""
+      zipCommand = "#{sevenZipPath}7z.exe a -r \"#{assetName}\" \"#{sourcePath}\""
     else
       zipCommand = "zip -r --symlinks '#{assetName}' '#{sourcePath}'"
     options = {cwd: directory, maxBuffer: Infinity}
@@ -134,10 +136,10 @@ zipAssets = (buildDir, assets, callback) ->
   async.parallel(tasks, callback)
 
 getAtomDraftRelease = (isPrerelease, branchName, callback) ->
-  atomRepo = new GitHub({repo: 'atom/atom', token})
+  atomRepo = new GitHub({repo: repo, token})
   atomRepo.getReleases {prerelease: isPrerelease}, (error, releases=[]) ->
     if error?
-      logError('Fetching atom/atom releases failed', error, releases)
+      logError("Fetching #{repo} #{if isPrerelease then "pre" else "" }releases failed", error, releases)
       callback(error)
     else
       [firstDraft] = releases.filter ({draft}) -> draft
@@ -160,7 +162,7 @@ getAtomDraftRelease = (isPrerelease, branchName, callback) ->
 createAtomDraftRelease = (isPrerelease, branchName, callback) ->
   {version} = require('../../package.json')
   options =
-    uri: 'https://api.github.com/repos/atom/atom/releases'
+    uri: "https://api.github.com/repos/#{repo}/releases"
     method: 'POST'
     headers: defaultHeaders
     json:
@@ -177,7 +179,7 @@ createAtomDraftRelease = (isPrerelease, branchName, callback) ->
 
   request options, (error, response, body='') ->
     if error? or response.statusCode isnt 201
-      logError("Creating atom/atom draft release failed", error, body)
+      logError("Creating #{repo} draft release failed", error, body)
       callback(error ? new Error(response.statusCode))
     else
       callback(null, body)

docs/build-instructions/linux.md

@@ -25,7 +25,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 ### Fedora / CentOS / RHEL
 
 * `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
-* Instructions for [Node.js](https://github.com/nodejs/node-v0.x-archive/wiki/Installing-Node.js-via-package-manager#enterprise-linux-and-fedora).
+* Instructions for [Node.js](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora).
 
 ### Arch
 

package.json

@@ -76,12 +76,12 @@
     "one-light-syntax": "1.3.0",
     "solarized-dark-syntax": "1.0.2",
     "solarized-light-syntax": "1.0.2",
-    "about": "1.5.2",
+    "about": "1.5.3",
     "archive-view": "0.61.1",
     "autocomplete-atom-api": "0.10.0",
     "autocomplete-css": "0.11.2",
     "autocomplete-html": "0.7.2",
-    "autocomplete-plus": "2.31.0",
+    "autocomplete-plus": "2.31.1",
     "autocomplete-snippets": "1.11.0",
     "autoflow": "0.27.0",
     "autosave": "0.23.1",
@@ -93,12 +93,12 @@
     "dev-live-reload": "0.47.0",
     "encoding-selector": "0.22.0",
     "exception-reporting": "0.38.1",
-    "find-and-replace": "0.200.0",
+    "find-and-replace": "0.201.0",
     "fuzzy-finder": "1.2.0",
     "git-diff": "1.0.1",
     "go-to-line": "0.31.0",
     "grammar-selector": "0.48.1",
-    "image-view": "0.58.1",
+    "image-view": "0.58.2",
     "incompatible-packages": "0.26.1",
     "keybinding-resolver": "0.35.0",
     "line-ending-selector": "0.5.0",
@@ -108,7 +108,7 @@
     "notifications": "0.65.0",
     "open-on-github": "1.1.0",
     "package-generator": "1.0.0",
-    "settings-view": "0.239.0",
+    "settings-view": "0.240.0",
     "snippets": "1.0.2",
     "spell-check": "0.67.1",
     "status-bar": "1.3.1",

src/environment-helpers.js

@@ -72,7 +72,10 @@ function needsPatching (options = { platform: process.platform, env: process.env
 // underlying functionality.
 function clone (to, from) {
   for (var key in to) {
-    delete to[key]
+    // Don't erase NODE_ENV. Fixes #12024
+    if (key !== 'NODE_ENV') {
+      delete to[key]
+    }
   }
 
   Object.assign(to, from)