1.32.0

9 files changed, 153 insertions, 170 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83243db06fdb..2d5ece5d48f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Jun  3 14:31:20 UTC 2018
 pkgbase = atom-transparent
-	pkgdesc = A hackable text editor for the 21st Century - with transparent background support
-	pkgver = 1.27.1
+	pkgdesc = A hackable text editor for the 21st Century, with transparency patch.
+	pkgver = 1.32.0
 	pkgrel = 1
 	url = https://github.com/atom/atom
 	arch = x86_64
@@ -15,30 +13,28 @@ pkgbase = atom-transparent
 	depends = libxkbfile
 	optdepends = ctags: symbol indexing support
 	optdepends = git: Git and GitHub integration
-	conflicts = atom-editor
+	replaces = atom-editor
 	replaces = atom-editor-transparent
 	options = !emptydirs
-	source = atom-1.27.1.tar.gz::https://github.com/atom/atom/archive/v1.27.1.tar.gz
+	source = atom-1.32.0.tar.gz::https://github.com/atom/atom/archive/v1.32.0.tar.gz
 	source = atom.js
 	source = dugite-use-system-git.patch
 	source = fix-atom-sh.patch
 	source = fix-license-path.patch
-	source = fix-node8.patch
 	source = fix-restart.patch
 	source = symbols-view-use-system-ctags.patch
 	source = use-system-apm.patch
 	source = use-system-electron.patch
 	source = enable-transparency.patch
-	sha256sums = 147c237d944d0261ac2caf525badd8c76cf92da99bb6901c89e491fb5f0c16bf
+	sha256sums = abb1a091fa493f186749d50c9444e762ed46f57c39055d022a50e166c7ffa8c6
 	sha256sums = cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd
-	sha256sums = 3fadee5a2d8c1ff35e085f9b9f3cf2eb71627bda9e8b10c2a0bd85b268591bf6
-	sha256sums = d8d77adebd7bd4eaf024988c68c30dc6b968044f7a6381227d13b6d77fa2b442
-	sha256sums = 7f0142c91e24236a3a6dcc70af9d4217f65c5a764091876a916e3bbafa4ed0fa
-	sha256sums = eb771d7c009be8d48c1387ed63f3e575dc12f3bd69455b4be4b78ab57cb49b86
-	sha256sums = f81a8dd53403fe76d80716b65d69bec141fae0b1a9a6ef56314f9e815e48f132
+	sha256sums = 530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153
+	sha256sums = ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2
+	sha256sums = c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205
+	sha256sums = cbac8d28e32a32760cd6b16d313e05e32af57bfdea1c248636e1b1ae74e4e92c
 	sha256sums = 3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8
-	sha256sums = 4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b
-	sha256sums = 1d0ff39e5bc5c0bfbb08a533bff9fb834a8dbc70d280bf93b5e2649fff181221
+	sha256sums = 53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806
+	sha256sums = 25ffc77d9d0f89a598041f5c823f5e65a662681f570f3894cb74aca7306e1026
 	sha256sums = 2cb262dfd15f67dd1a01a9b314983f535da8b06ce4a814d214e12ec369631d58
 
 pkgname = atom-transparent
diff --git a/PKGBUILD b/PKGBUILD
index c5c37c8b3fc7..2176b8f19de8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
-# Maintainer: Frantic1048 <archer@frantic1048.com>
-# Upstream URL: https://github.com/atom/atom
+# Maintainer: frantic1048<archer@frantic1048.com>
 
 pkgname=atom-transparent
-pkgver=1.27.1
+pkgver=1.32.0
 pkgrel=1
-pkgdesc='A hackable text editor for the 21st Century - with transparent background support'
+pkgdesc='A hackable text editor for the 21st Century, with transparency patch.'
 arch=('x86_64')
 url='https://github.com/atom/atom'
 license=('MIT' 'custom')
@@ -12,30 +11,27 @@ depends=('apm' 'electron' 'libxkbfile')
 makedepends=('git' 'npm')
 optdepends=('ctags: symbol indexing support'
             'git: Git and GitHub integration')
-conflicts=('atom-editor')
-replaces=('atom-editor-transparent')
+replaces=('atom-editor' 'atom-editor-transparent')
 options=(!emptydirs)
 source=("atom-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
         'atom.js'
         'dugite-use-system-git.patch'
         'fix-atom-sh.patch'
         'fix-license-path.patch'
-        'fix-node8.patch'
         'fix-restart.patch'
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch'
         'enable-transparency.patch')
-sha256sums=('147c237d944d0261ac2caf525badd8c76cf92da99bb6901c89e491fb5f0c16bf'
+sha256sums=('abb1a091fa493f186749d50c9444e762ed46f57c39055d022a50e166c7ffa8c6'
             'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
-            '3fadee5a2d8c1ff35e085f9b9f3cf2eb71627bda9e8b10c2a0bd85b268591bf6'
-            'd8d77adebd7bd4eaf024988c68c30dc6b968044f7a6381227d13b6d77fa2b442'
-            '7f0142c91e24236a3a6dcc70af9d4217f65c5a764091876a916e3bbafa4ed0fa'
-            'eb771d7c009be8d48c1387ed63f3e575dc12f3bd69455b4be4b78ab57cb49b86'
-            'f81a8dd53403fe76d80716b65d69bec141fae0b1a9a6ef56314f9e815e48f132'
+            '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
+            'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2'
+            'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205'
+            'cbac8d28e32a32760cd6b16d313e05e32af57bfdea1c248636e1b1ae74e4e92c'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
-            '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b'
-            '1d0ff39e5bc5c0bfbb08a533bff9fb834a8dbc70d280bf93b5e2649fff181221'
+            '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806'
+            '25ffc77d9d0f89a598041f5c823f5e65a662681f570f3894cb74aca7306e1026'
             '2cb262dfd15f67dd1a01a9b314983f535da8b06ce4a814d214e12ec369631d58')
 
 prepare() {
@@ -45,31 +41,15 @@ prepare() {
   patch -Np1 -i "${srcdir}"/use-system-electron.patch
   patch -Np1 -i "${srcdir}"/use-system-apm.patch
   patch -Np1 -i "${srcdir}"/fix-license-path.patch
-  patch -Np1 -i "${srcdir}"/fix-node8.patch
   patch -Np1 -i "${srcdir}"/fix-restart.patch
   patch -Np1 -i "${srcdir}"/enable-transparency.patch
-
-  # Workaround for Node 10
-  sed -e 's|"electron-link": "0.2.0"|"electron-link": "../../electron-link"|' \
-      -i script/package.json
-  cd ..
-  git clone https://github.com/atom/electron-link.git
-  cd electron-link
-  git checkout v0.2.0
-  sed -e 's/"leveldown": "^1.6.0"/"leveldown": "^2.0.1"/' -i package.json
-  npm install
-  npx babel src -d lib
-  cd node_modules/levelup
-  sed -e 's/"leveldown": "^1.1.0"/"leveldown": "^2.0.1"/' -i package.json
 }
 
 build() {
   cd "${srcdir}/atom-${pkgver}"
 
-  export ATOM_RESOURCE_PATH="$srcdir/atom-$pkgver"
-  # If unset, ~/.atom/.node-gyp/.atom/.npm is used
-  export NPM_CONFIG_CACHE="${HOME}/.atom/.npm"
-  apm clean
+  ATOM_RESOURCE_PATH="${PWD}" \
+  npm_config_target=$(tail -c +2 /usr/lib/electron/version) \
   apm install
 
   # Use system ctags
@@ -78,7 +58,7 @@ build() {
   rm -r vendor
   cd ../..
 
-  # Use system git (TODO: set LOCAL_GIT_DIRECTORY=/usr)
+  # Use system git
   cd node_modules/dugite
   patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch
   rm -r git
@@ -100,7 +80,8 @@ package() {
   install -d -m 755 "${pkgdir}/usr/share/applications"
   sed -e "s|<%= appName %>|Atom|" \
       -e "s/<%= description %>/${pkgdesc}/" \
-      -e "s|<%= installDir %>/share/<%= appFileName %>/atom|/usr/lib/atom/atom|" \
+      -e "s|<%= installDir %>|/usr|" \
+      -e "s|<%= appFileName %>|atom|" \
       -e "s|<%= iconPath %>|atom|" \
       resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
 
@@ -117,7 +98,6 @@ package() {
   node -e "require('./script/lib/get-license-text')().then((licenseText) => require('fs').writeFileSync('${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md', licenseText))"
 
   # Remove useless stuff
-  rm "${pkgdir}"/usr/lib/atom/node_modules/.bin/pegjs
   find "${pkgdir}"/usr/lib/atom/node_modules \
       -name "*.a" -exec rm '{}' \; \
       -or -name "*.bat" -exec rm '{}' \; \
diff --git a/dugite-use-system-git.patch b/dugite-use-system-git.patch
index 3f6feec740a7..c28ccd0968b2 100644
--- a/dugite-use-system-git.patch
+++ b/dugite-use-system-git.patch
@@ -1,6 +1,6 @@
 --- a/build/lib/git-environment.js
 +++ b/build/lib/git-environment.js
-@@ -18,7 +18,7 @@
+@@ -24,7 +24,7 @@
          return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
      }
      else {
@@ -9,7 +9,16 @@
      }
  }
  /**
-@@ -100,9 +100,9 @@
+@@ -57,7 +57,7 @@
+         return path.join(gitDir, 'mingw32', 'libexec', 'git-core');
+     }
+     else {
+-        return path.join(gitDir, 'libexec', 'git-core');
++        return path.join(gitDir, 'lib', 'git-core');
+     }
+ }
+ /**
+@@ -108,9 +108,9 @@
          if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
              // use the SSL certificate bundle included in the distribution only
              // when using embedded Git and not providing your own bundle
diff --git a/fix-atom-sh.patch b/fix-atom-sh.patch
index e044994e4c4a..6d7106a9b316 100644
--- a/fix-atom-sh.patch
+++ b/fix-atom-sh.patch
@@ -1,6 +1,6 @@
 --- a/atom.sh
 +++ b/atom.sh
-@@ -1,26 +1,5 @@
+@@ -1,29 +1,5 @@
  #!/bin/bash
  
 -if [ "$(uname)" == 'Darwin' ]; then
@@ -16,6 +16,9 @@
 -  atom-beta)
 -    CHANNEL=beta
 -    ;;
+-  atom-nightly)
+-    CHANNEL=nightly
+-    ;;
 -  atom-dev)
 -    CHANNEL=dev
 -    ;;
@@ -27,9 +30,9 @@
  export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
  
  while getopts ":wtfvh-:" opt; do
-@@ -59,85 +38,22 @@
-   exec 2> /dev/null
- fi
+@@ -65,95 +41,19 @@
+ ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
+ mkdir -p "$ATOM_HOME"
  
 -if [ $OS == 'Mac' ]; then
 -  if [ -L "$0" ]; then
@@ -44,11 +47,22 @@
 -    ATOM_PATH="$(dirname "$ATOM_APP")"
 -    ATOM_APP_NAME="$(basename "$ATOM_APP")"
 -  fi
--
--  if [ "$CHANNEL" == 'beta' ]; then
--    ATOM_EXECUTABLE_NAME="Atom Beta"
++ATOM_PATH="/usr/lib/atom/atom"
+ 
+-  if [ ! -z "${ATOM_APP_NAME}" ]; then
+-    # If ATOM_APP_NAME is known, use it as the executable name
+-    ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
 -  else
--    ATOM_EXECUTABLE_NAME="Atom"
+-    # Else choose it from the inferred channel name
+-    if [ "$CHANNEL" == 'beta' ]; then
+-      ATOM_EXECUTABLE_NAME="Atom Beta"
+-    elif [ "$CHANNEL" == 'nightly' ]; then
+-      ATOM_EXECUTABLE_NAME="Atom Nightly"
+-    elif [ "$CHANNEL" == 'dev' ]; then
+-      ATOM_EXECUTABLE_NAME="Atom Dev"
+-    else
+-      ATOM_EXECUTABLE_NAME="Atom"
+-    fi
 -  fi
 -
 -  if [ -z "${ATOM_PATH}" ]; then
@@ -83,6 +97,9 @@
 -    beta)
 -      ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
 -      ;;
+-    nightly)
+-      ATOM_PATH="$USR_DIRECTORY/share/atom-nightly/atom"
+-      ;;
 -    dev)
 -      ATOM_PATH="$USR_DIRECTORY/share/atom-dev/atom"
 -      ;;
@@ -91,14 +108,8 @@
 -      ;;
 -  esac
 -
--  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
--  mkdir -p "$ATOM_HOME"
-+ATOM_PATH="/usr/lib/atom/atom"
- 
 -  : ${TMPDIR:=/tmp}
-+ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
-+mkdir -p "$ATOM_HOME"
- 
+-
 -  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
 -
 -  if [ $EXPECT_OUTPUT ]; then
diff --git a/fix-license-path.patch b/fix-license-path.patch
index f4c06bb28796..4580353b9126 100644
--- a/fix-license-path.patch
+++ b/fix-license-path.patch
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -414,7 +414,7 @@
+@@ -416,7 +416,7 @@
      this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
      this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
      this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
@@ -11,7 +11,7 @@
        for (let window of this.getAllWindows()) {
 --- a/src/workspace.js
 +++ b/src/workspace.js
-@@ -1124,7 +1124,7 @@
+@@ -1132,7 +1132,7 @@
  
    // Open Atom's license in the active pane.
    openLicense () {
diff --git a/fix-node8.patch b/fix-node8.patch
deleted file mode 100644
index dfed3ef2109d..000000000000
--- a/fix-node8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/module-cache.coffee
-+++ b/src/module-cache.coffee
-@@ -189,7 +189,7 @@ resolveModulePath = (relativePath, parentModule) ->
-   return unless candidates?
- 
-   for version, resolvedPath of candidates
--    if Module._cache.hasOwnProperty(resolvedPath) or isCorePath(resolvedPath)
-+    if Boolean(Module._cache[resolvedPath]) or isCorePath(resolvedPath)
-       return resolvedPath if satisfies(version, range)
- 
-   return
diff --git a/fix-restart.patch b/fix-restart.patch
index d35e54d453f4..a4955c74ac1c 100644
--- a/fix-restart.patch
+++ b/fix-restart.patch
@@ -1,6 +1,6 @@
 --- a/src/main-process/atom-application.js
 +++ b/src/main-process/atom-application.js
-@@ -1347,7 +1347,7 @@
+@@ -1356,7 +1356,7 @@
    }
  
    restart () {
diff --git a/use-system-apm.patch b/use-system-apm.patch
index 23cc90c9212f..55be464c06a4 100644
--- a/use-system-apm.patch
+++ b/use-system-apm.patch
@@ -10,12 +10,12 @@
    childProcess.execFileSync(
 -    CONFIG.getApmBinPath(),
 +    'apm',
-     ['--loglevel=error', 'install'],
-     {env: installEnv, cwd: packagePath, stdio: 'inherit'}
+     ['--loglevel=error', ci ? 'ci' : 'install'],
+     {env: installEnv, cwd: packagePath, stdio: stdioOptions || 'inherit'}
    )
 --- a/src/package-manager.js
 +++ b/src/package-manager.js
-@@ -166,13 +166,7 @@
+@@ -169,13 +169,7 @@
        return configPath || this.apmPath
      }
  
diff --git a/use-system-electron.patch b/use-system-electron.patch
index 0b82e21e76e8..61be96894738 100644
--- a/use-system-electron.patch
+++ b/use-system-electron.patch
@@ -4,10 +4,10 @@
      "url": "https://github.com/atom/atom/issues"
    },
    "license": "MIT",
--  "electronVersion": "1.7.15",
+-  "electronVersion": "2.0.9",
    "dependencies": {
-     "@atom/nsfw": "^1.0.18",
-     "@atom/watcher": "1.0.3",
+     "@atom/nsfw": "1.0.18",
+     "@atom/source-map-support": "^0.3.4",
 --- a/script/build
 +++ b/script/build
 @@ -2,10 +2,6 @@
@@ -21,87 +21,93 @@
  // Needed so we can require src/module-cache.coffee during generateModuleCache
  require('coffee-script/register')
  require('colors')
-@@ -26,7 +22,6 @@
+@@ -28,7 +24,6 @@
    .wrap(yargs.terminalWidth())
    .argv
  
 -const checkChromedriverVersion = require('./lib/check-chromedriver-version')
  const cleanOutputDirectory = require('./lib/clean-output-directory')
- const cleanPackageLock = require('./lib/clean-package-lock')
  const codeSignOnMac = require('./lib/code-sign-on-mac')
+ const codeSignOnWindows = require('./lib/code-sign-on-windows')
 @@ -60,7 +55,6 @@
+ let binariesPromise = Promise.resolve()
  
  if (!argv.existingBinaries) {
-   cleanPackageLock()
 -  checkChromedriverVersion()
    cleanOutputDirectory()
    copyAssets()
    transpilePackagesWithCustomTranspilerPaths()
-@@ -76,61 +70,4 @@
- }
+@@ -79,67 +73,5 @@
  
- binariesPromise
--  .then(packageApplication)
-   .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath))
--  .then(packagedAppPath => {
--    switch (process.platform) {
--      case 'darwin': {
--        if (argv.codeSign) {
--          codeSignOnMac(packagedAppPath)
--        } else {
--          console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+ if (!argv.generateApiDocs) {
+   binariesPromise
+-    .then(packageApplication)
+     .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath))
+-    .then(packagedAppPath => {
+-      switch (process.platform) {
+-        case 'darwin': {
+-          if (argv.codeSign) {
+-            codeSignOnMac(packagedAppPath)
+-          } else {
+-            console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+-          }
+-          break
 -        }
--      }
--      case 'win32': {
--        if (argv.codeSign) {
--          const executablesToSign = [ path.join(packagedAppPath, 'Atom.exe') ]
+-        case 'win32': {
+-          if (argv.codeSign) {
+-            const executablesToSign = [ path.join(packagedAppPath, 'Atom.exe') ]
+-            if (argv.createWindowsInstaller) {
+-              executablesToSign.push(path.join(__dirname, 'node_modules', 'electron-winstaller', 'vendor', 'Update.exe'))
+-            }
+-            codeSignOnWindows(executablesToSign)
+-          } else {
+-            console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+-          }
 -          if (argv.createWindowsInstaller) {
--            executablesToSign.push(path.join(__dirname, 'node_modules', 'electron-winstaller', 'vendor', 'Update.exe'))
+-            return createWindowsInstaller(packagedAppPath)
+-              .then((installerPath) => {
+-                argv.codeSign && codeSignOnWindows([installerPath])
+-                return packagedAppPath
+-              })
+-          } else {
+-            console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray)
 -          }
--          codeSignOnWindows(executablesToSign)
--        } else {
--          console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
--        }
--        if (argv.createWindowsInstaller) {
--          return createWindowsInstaller(packagedAppPath)
--            .then(() => argv.codeSign && codeSignOnWindows([ path.join(CONFIG.buildOutputPath, 'AtomSetup.exe') ]))
--            .then(() => packagedAppPath)
--        } else {
--          console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray)
--        }
--      }
--      case 'linux': {
--        if (argv.createDebianPackage) {
--          createDebianPackage(packagedAppPath)
--        } else {
--          console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray)
+-          break
 -        }
+-        case 'linux': {
+-          if (argv.createDebianPackage) {
+-            createDebianPackage(packagedAppPath)
+-          } else {
+-            console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray)
+-          }
 -
--        if (argv.createRpmPackage) {
--          createRpmPackage(packagedAppPath)
--        } else {
--          console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray)
+-          if (argv.createRpmPackage) {
+-            createRpmPackage(packagedAppPath)
+-          } else {
+-            console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray)
+-          }
+-          break
 -        }
 -      }
--    }
 -
--    return Promise.resolve(packagedAppPath)
--  }).then(packagedAppPath => {
--    if (argv.compressArtifacts) {
--      compressArtifacts(packagedAppPath)
--    } else {
--      console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray)
--    }
+-      return Promise.resolve(packagedAppPath)
+-    }).then(packagedAppPath => {
+-      if (argv.compressArtifacts) {
+-        compressArtifacts(packagedAppPath)
+-      } else {
+-        console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray)
+-      }
 -
--    if (argv.install != null) {
--      installApplication(packagedAppPath, argv.install)
--    } else {
--      console.log('Skipping installation. Specify the --install option to install Atom'.gray)
--    }
--  })
+-      if (argv.install != null) {
+-        installApplication(packagedAppPath, argv.install)
+-      } else {
+-        console.log('Skipping installation. Specify the --install option to install Atom'.gray)
+-      }
+-    })
+ }
 --- a/script/lib/generate-startup-snapshot.js
 +++ b/script/lib/generate-startup-snapshot.js
-@@ -79,7 +79,7 @@
+@@ -89,7 +89,7 @@
      } else if (process.platform === 'win32') {
        nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe')
      } else {
@@ -110,7 +116,7 @@
      }
      childProcess.execFileSync(
        nodeBundledInElectronPath,
-@@ -87,6 +87,7 @@
+@@ -97,6 +97,7 @@
        {env: Object.assign({}, process.env, {ELECTRON_RUN_AS_NODE: 1})}
      )
  
@@ -118,7 +124,7 @@
      const generatedStartupBlobPath = path.join(CONFIG.buildOutputPath, 'snapshot_blob.bin')
      console.log(`Generating startup blob at "${generatedStartupBlobPath}"`)
      childProcess.execFileSync(
-@@ -104,5 +105,6 @@
+@@ -114,5 +115,6 @@
      console.log(`Moving generated startup blob into "${startupBlobDestinationPath}"`)
      fs.unlinkSync(startupBlobDestinationPath)
      fs.renameSync(generatedStartupBlobPath, startupBlobDestinationPath)
@@ -127,13 +133,13 @@
  }
 --- a/script/package.json
 +++ b/script/package.json
-@@ -7,9 +7,7 @@
+@@ -9,9 +9,7 @@
      "coffeelint": "1.15.7",
      "colors": "1.1.2",
      "donna": "1.0.16",
--    "electron-chromedriver": "~1.7",
-     "electron-link": "0.2.0",
--    "electron-mksnapshot": "~1.7",
+-    "electron-chromedriver": "~2.0",
+     "electron-link": "0.2.2",
+-    "electron-mksnapshot": "~2.0",
      "electron-packager": "7.3.0",
      "electron-winstaller": "2.6.4",
      "fs-admin": "^0.1.5",
@@ -148,34 +154,26 @@
          name: null
        }
      }
---- a/src/main-process/start.js
-+++ b/src/main-process/start.js
-@@ -95,5 +95,5 @@ function handleStartupEventWithSquirrel () {
- function setupCompileCache () {
-   const CompileCache = require('../compile-cache')
-   CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
--  CompileCache.install(process.resourcesPath, require)
-+  CompileCache.install('/usr/lib/atom', require)
+ function getConfig () {
+--- a/src/module-cache.js
++++ b/src/module-cache.js
+@@ -227,7 +227,7 @@
  }
---- a/src/module-cache.coffee
-+++ b/src/module-cache.coffee
-@@ -195,7 +195,7 @@ resolveModulePath = (relativePath, parentModule) ->
-   return
  
- registerBuiltins = (devMode) ->
--  if devMode or not cache.resourcePath.startsWith("#{process.resourcesPath}#{path.sep}")
-+  if devMode or not cache.resourcePath.startsWith("/usr/lib/atom")
-     fs = require 'fs-plus'
-     atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js')
-     cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
+ function registerBuiltins (devMode) {
+-  if (devMode || !cache.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) {
++  if (devMode || !cache.resourcePath.startsWith('/usr/lib/atom/')) {
+     const fs = require('fs-plus')
+     const atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js')
+     if (fs.isFileSync(atomJsPath)) { cache.builtins.atom = atomJsPath }
 --- a/src/package-manager.js
 +++ b/src/package-manager.js
-@@ -807,7 +807,7 @@ module.exports = class PackageManager {
+@@ -825,7 +825,7 @@ module.exports = class PackageManager {
    }
  
    isBundledPackagePath (packagePath) {
 -    if (this.devMode && !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) {
-+    if (this.devMode && this.resourcePath !== '/usr/lib/atom') {
++    if (this.devMode && !this.resourcePath.startsWith('/usr/lib/atom/')) {
        return false
      }