[arch-commits] Commit in atom/repos (32 files)

Nicola Squartini tensor5 at archlinux.org
Wed Nov 1 10:20:38 UTC 2017


    Date: Wednesday, November 1, 2017 @ 10:20:35
  Author: tensor5
Revision: 264979

archrelease: copy trunk to community-i686, community-x86_64

Added:
  atom/repos/community-i686/PKGBUILD
    (from rev 264978, atom/trunk/PKGBUILD)
  atom/repos/community-i686/dugite-use-system-git.patch
    (from rev 264978, atom/trunk/dugite-use-system-git.patch)
  atom/repos/community-i686/fix-atom-sh.patch
    (from rev 264978, atom/trunk/fix-atom-sh.patch)
  atom/repos/community-i686/fix-license-path.patch
    (from rev 264978, atom/trunk/fix-license-path.patch)
  atom/repos/community-i686/fix-restart.patch
    (from rev 264978, atom/trunk/fix-restart.patch)
  atom/repos/community-i686/symbols-view-use-system-ctags.patch
    (from rev 264978, atom/trunk/symbols-view-use-system-ctags.patch)
  atom/repos/community-i686/use-system-apm.patch
    (from rev 264978, atom/trunk/use-system-apm.patch)
  atom/repos/community-i686/use-system-electron.patch
    (from rev 264978, atom/trunk/use-system-electron.patch)
  atom/repos/community-x86_64/PKGBUILD
    (from rev 264978, atom/trunk/PKGBUILD)
  atom/repos/community-x86_64/dugite-use-system-git.patch
    (from rev 264978, atom/trunk/dugite-use-system-git.patch)
  atom/repos/community-x86_64/fix-atom-sh.patch
    (from rev 264978, atom/trunk/fix-atom-sh.patch)
  atom/repos/community-x86_64/fix-license-path.patch
    (from rev 264978, atom/trunk/fix-license-path.patch)
  atom/repos/community-x86_64/fix-restart.patch
    (from rev 264978, atom/trunk/fix-restart.patch)
  atom/repos/community-x86_64/symbols-view-use-system-ctags.patch
    (from rev 264978, atom/trunk/symbols-view-use-system-ctags.patch)
  atom/repos/community-x86_64/use-system-apm.patch
    (from rev 264978, atom/trunk/use-system-apm.patch)
  atom/repos/community-x86_64/use-system-electron.patch
    (from rev 264978, atom/trunk/use-system-electron.patch)
Deleted:
  atom/repos/community-i686/PKGBUILD
  atom/repos/community-i686/dugite-use-system-git.patch
  atom/repos/community-i686/fix-atom-sh.patch
  atom/repos/community-i686/fix-license-path.patch
  atom/repos/community-i686/fix-restart.patch
  atom/repos/community-i686/symbols-view-use-system-ctags.patch
  atom/repos/community-i686/use-system-apm.patch
  atom/repos/community-i686/use-system-electron.patch
  atom/repos/community-x86_64/PKGBUILD
  atom/repos/community-x86_64/dugite-use-system-git.patch
  atom/repos/community-x86_64/fix-atom-sh.patch
  atom/repos/community-x86_64/fix-license-path.patch
  atom/repos/community-x86_64/fix-restart.patch
  atom/repos/community-x86_64/symbols-view-use-system-ctags.patch
  atom/repos/community-x86_64/use-system-apm.patch
  atom/repos/community-x86_64/use-system-electron.patch

------------------------------------------------------+
 /PKGBUILD                                            |  216 +++++++++
 /dugite-use-system-git.patch                         |   48 ++
 /fix-atom-sh.patch                                   |  230 +++++++++
 /fix-license-path.patch                              |   44 +
 /fix-restart.patch                                   |   22 
 /symbols-view-use-system-ctags.patch                 |   22 
 /use-system-apm.patch                                |   64 ++
 /use-system-electron.patch                           |  392 +++++++++++++++++
 community-i686/PKGBUILD                              |  108 ----
 community-i686/dugite-use-system-git.patch           |   24 -
 community-i686/fix-atom-sh.patch                     |  115 ----
 community-i686/fix-license-path.patch                |   22 
 community-i686/fix-restart.patch                     |   11 
 community-i686/symbols-view-use-system-ctags.patch   |   11 
 community-i686/use-system-apm.patch                  |   32 -
 community-i686/use-system-electron.patch             |  196 --------
 community-x86_64/PKGBUILD                            |  108 ----
 community-x86_64/dugite-use-system-git.patch         |   24 -
 community-x86_64/fix-atom-sh.patch                   |  115 ----
 community-x86_64/fix-license-path.patch              |   22 
 community-x86_64/fix-restart.patch                   |   11 
 community-x86_64/symbols-view-use-system-ctags.patch |   11 
 community-x86_64/use-system-apm.patch                |   32 -
 community-x86_64/use-system-electron.patch           |  196 --------
 24 files changed, 1038 insertions(+), 1038 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-i686/PKGBUILD	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,108 +0,0 @@
-# $Id$
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=atom
-pkgver=1.21.1
-pkgrel=1
-pkgdesc='A hackable text editor for the 21st Century'
-arch=('i686' 'x86_64')
-url='https://github.com/atom/atom'
-license=('MIT' 'custom')
-depends=('apm' 'electron' 'libxkbfile')
-makedepends=('git' 'npm')
-optdepends=('ctags: symbol indexing support'
-            'git: Git and GitHub integration')
-replaces=('atom-editor')
-options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
-        'dugite-use-system-git.patch'
-        'fix-atom-sh.patch'
-        'fix-license-path.patch'
-        'fix-restart.patch'
-        'symbols-view-use-system-ctags.patch'
-        'use-system-apm.patch'
-        'use-system-electron.patch')
-sha256sums=('537cbb6be91d3bd2a7b6372c14b95b8ae07ee8bc06d608bcab8a3dc93a6cc88d'
-            'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba'
-            '7f4f86387d226fcd452f0b97579dadc3eac217a77485228dbf4facf3391b6198'
-            '951bbc248c9ae4ef3ef712e0caeb728a8577b12e4593870569de15e570a71c4c'
-            '646f81b0621a86eff3bb1f229eeb92b2f33bac41b3324424a6de06a780a8a22d'
-            '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
-            'c120739911ce6a455a642c97d4d7de0956abee4d94bfc338f8a13f771a2d381c'
-            '13ee051e304cb8e612d5e910dc9a3e73b5d993df9afce2f2d22d2d24a9e938c7')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}"/fix-atom-sh.patch
-  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-restart.patch
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${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
-  apm install
-
-  # Use system ctags
-  cd node_modules/symbols-view
-  patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch
-  rm -r vendor
-  cd ../..
-
-  # Use system git (TODO: set LOCAL_GIT_DIRECTORY=/usr)
-  cd node_modules/dugite
-  patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch
-  rm -r git
-  cd ../..
-
-  cd script
-  npm install
-  ./build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -d -m 755 "${pkgdir}"/usr/lib
-  cp -r out/app "${pkgdir}"/usr/lib/atom
-
-  install -d -m 755 "${pkgdir}/usr/share/applications"
-  sed -e "s|<%= appName %>|Atom|" \
-      -e "s/<%= description %>/${pkgdesc}/" \
-      -e "s|<%= installDir %>/share/<%= appFileName %>/atom|electron --app=/usr/lib/atom|" \
-      -e "s|<%= iconPath %>|atom|" \
-      resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
-
-  for size in 16 24 32 48 64 128 256 512 1024; do
-    install -D -m 644 resources/app-icons/stable/png/${size}.png \
-            "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/atom.png
-  done
-  ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
-      "${pkgdir}"/usr/lib/atom/resources/atom.png
-
-  install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
-
-  install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  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 '{}' \; \
-      -or -name "*.node" -exec chmod a-x '{}' \; \
-      -or -name "benchmark" -prune -exec rm -r '{}' \; \
-      -or -name "doc" -prune -exec rm -r '{}' \; \
-      -or -name "html" -prune -exec rm -r '{}' \; \
-      -or -name "man" -prune -exec rm -r '{}' \; \
-      -or -name "scripts" -prune -exec rm -r '{}' \; \
-      -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
-      -or -path "*/task-lists/src" -prune -exec rm -r '{}' \;
-}

Copied: atom/repos/community-i686/PKGBUILD (from rev 264978, atom/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=atom
+pkgver=1.21.2
+pkgrel=1
+pkgdesc='A hackable text editor for the 21st Century'
+arch=('i686' 'x86_64')
+url='https://github.com/atom/atom'
+license=('MIT' 'custom')
+depends=('apm' 'electron' 'libxkbfile')
+makedepends=('git' 'npm')
+optdepends=('ctags: symbol indexing support'
+            'git: Git and GitHub integration')
+replaces=('atom-editor')
+options=(!emptydirs)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
+        'dugite-use-system-git.patch'
+        'fix-atom-sh.patch'
+        'fix-license-path.patch'
+        'fix-restart.patch'
+        'symbols-view-use-system-ctags.patch'
+        'use-system-apm.patch'
+        'use-system-electron.patch')
+sha256sums=('1aff8c81d366c4d0a2a3767ee34512ffc3504265a430b93c6c7569cddc988c28'
+            'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba'
+            '7f4f86387d226fcd452f0b97579dadc3eac217a77485228dbf4facf3391b6198'
+            '951bbc248c9ae4ef3ef712e0caeb728a8577b12e4593870569de15e570a71c4c'
+            '646f81b0621a86eff3bb1f229eeb92b2f33bac41b3324424a6de06a780a8a22d'
+            '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
+            'c120739911ce6a455a642c97d4d7de0956abee4d94bfc338f8a13f771a2d381c'
+            'e957bf927dc39b434167fecf6bdd01d78f9c6f71f24bcf86fa2d89dc254a7f96')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}"/fix-atom-sh.patch
+  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-restart.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${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
+  apm install
+
+  # Use system ctags
+  cd node_modules/symbols-view
+  patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch
+  rm -r vendor
+  cd ../..
+
+  # Use system git (TODO: set LOCAL_GIT_DIRECTORY=/usr)
+  cd node_modules/dugite
+  patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch
+  rm -r git
+  cd ../..
+
+  cd script
+  npm install
+  ./build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -d -m 755 "${pkgdir}"/usr/lib
+  cp -r out/app "${pkgdir}"/usr/lib/atom
+
+  install -d -m 755 "${pkgdir}/usr/share/applications"
+  sed -e "s|<%= appName %>|Atom|" \
+      -e "s/<%= description %>/${pkgdesc}/" \
+      -e "s|<%= installDir %>/share/<%= appFileName %>/atom|electron --app=/usr/lib/atom|" \
+      -e "s|<%= iconPath %>|atom|" \
+      resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
+
+  for size in 16 24 32 48 64 128 256 512 1024; do
+    install -D -m 644 resources/app-icons/stable/png/${size}.png \
+            "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/atom.png
+  done
+  ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
+      "${pkgdir}"/usr/lib/atom/resources/atom.png
+
+  install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
+
+  install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  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 '{}' \; \
+      -or -name "*.node" -exec chmod a-x '{}' \; \
+      -or -name "benchmark" -prune -exec rm -r '{}' \; \
+      -or -name "doc" -prune -exec rm -r '{}' \; \
+      -or -name "html" -prune -exec rm -r '{}' \; \
+      -or -name "man" -prune -exec rm -r '{}' \; \
+      -or -name "scripts" -prune -exec rm -r '{}' \; \
+      -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
+      -or -path "*/task-lists/src" -prune -exec rm -r '{}' \;
+}

Deleted: community-i686/dugite-use-system-git.patch
===================================================================
--- community-i686/dugite-use-system-git.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-i686/dugite-use-system-git.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,24 +0,0 @@
---- a/build/lib/git-environment.js
-+++ b/build/lib/git-environment.js
-@@ -18,7 +18,7 @@
-         return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
-     }
-     else {
--        return resolveEmbeddedGitDir();
-+        return '/usr';
-     }
- }
- /**
-@@ -96,9 +96,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
--            const distDir = resolveEmbeddedGitDir();
--            const sslCABundle = `${distDir}/ssl/cacert.pem`;
--            env.GIT_SSL_CAINFO = sslCABundle;
-+            // const distDir = resolveEmbeddedGitDir();
-+            // const sslCABundle = `${distDir}/ssl/cacert.pem`;
-+            // env.GIT_SSL_CAINFO = sslCABundle;
-         }
-     }
-     return { env, gitLocation };

Copied: atom/repos/community-i686/dugite-use-system-git.patch (from rev 264978, atom/trunk/dugite-use-system-git.patch)
===================================================================
--- community-i686/dugite-use-system-git.patch	                        (rev 0)
+++ community-i686/dugite-use-system-git.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,24 @@
+--- a/build/lib/git-environment.js
++++ b/build/lib/git-environment.js
+@@ -18,7 +18,7 @@
+         return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
+     }
+     else {
+-        return resolveEmbeddedGitDir();
++        return '/usr';
+     }
+ }
+ /**
+@@ -96,9 +96,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
+-            const distDir = resolveEmbeddedGitDir();
+-            const sslCABundle = `${distDir}/ssl/cacert.pem`;
+-            env.GIT_SSL_CAINFO = sslCABundle;
++            // const distDir = resolveEmbeddedGitDir();
++            // const sslCABundle = `${distDir}/ssl/cacert.pem`;
++            // env.GIT_SSL_CAINFO = sslCABundle;
+         }
+     }
+     return { env, gitLocation };

Deleted: community-i686/fix-atom-sh.patch
===================================================================
--- community-i686/fix-atom-sh.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-i686/fix-atom-sh.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,115 +0,0 @@
---- a/atom.sh
-+++ b/atom.sh
-@@ -1,20 +1,5 @@
- #!/bin/bash
- 
--if [ "$(uname)" == 'Darwin' ]; then
--  OS='Mac'
--elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
--  OS='Linux'
--else
--  echo "Your platform ($(uname -a)) is not supported."
--  exit 1
--fi
--
--if [ "$(basename $0)" == 'atom-beta' ]; then
--  BETA_VERSION=true
--else
--  BETA_VERSION=
--fi
--
- export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
- 
- while getopts ":wtfvh-:" opt; do
-@@ -53,79 +38,22 @@
-   exec 2> /dev/null
- fi
- 
--if [ $OS == 'Mac' ]; then
--  if [ -L "$0" ]; then
--    SCRIPT="$(readlink "$0")"
--  else
--    SCRIPT="$0"
--  fi
--  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
--  if [ "$ATOM_APP" == . ]; then
--    unset ATOM_APP
--  else
--    ATOM_PATH="$(dirname "$ATOM_APP")"
--    ATOM_APP_NAME="$(basename "$ATOM_APP")"
--  fi
--
--  if [ -n "$BETA_VERSION" ]; then
--    ATOM_EXECUTABLE_NAME="Atom Beta"
--  else
--    ATOM_EXECUTABLE_NAME="Atom"
--  fi
--
--  if [ -z "${ATOM_PATH}" ]; then
--    # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
--    if [ -x "/Applications/$ATOM_APP_NAME" ]; then
--      ATOM_PATH="/Applications"
--    elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
--      ATOM_PATH="$HOME/Applications"
--    else
--      # We haven't found an Atom.app, use spotlight to search for Atom
--      ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
--
--      # Exit if Atom can't be found
--      if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
--        echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
--        exit 1
--      fi
--    fi
--  fi
--
--  if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
--    exit $?
--  else
--    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
--  fi
--elif [ $OS == 'Linux' ]; then
--  SCRIPT=$(readlink -f "$0")
--  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
--
--  if [ -n "$BETA_VERSION" ]; then
--    ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
--  else
--    ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
--  fi
--
--  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
--  mkdir -p "$ATOM_HOME"
--
--  : ${TMPDIR:=/tmp}
-+ATOM_PATH="electron --app=/usr/lib/atom"
- 
--  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
-+ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
-+mkdir -p "$ATOM_HOME"
- 
--  if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+if [ $EXPECT_OUTPUT ]; then
-+  $ATOM_PATH --executed-from="$(pwd)" --pid=$$ "$@"
-+  exit $?
-+else
-+  (
-+  nohup $ATOM_PATH --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+  if [ $? -ne 0 ]; then
-+    cat "$ATOM_HOME/nohup.out"
-     exit $?
--  else
--    (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
--    if [ $? -ne 0 ]; then
--      cat "$ATOM_HOME/nohup.out"
--      exit $?
--    fi
--    ) &
-   fi
-+  ) &
- fi
- 
- # Exits this process when Atom is used as $EDITOR

Copied: atom/repos/community-i686/fix-atom-sh.patch (from rev 264978, atom/trunk/fix-atom-sh.patch)
===================================================================
--- community-i686/fix-atom-sh.patch	                        (rev 0)
+++ community-i686/fix-atom-sh.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,115 @@
+--- a/atom.sh
++++ b/atom.sh
+@@ -1,20 +1,5 @@
+ #!/bin/bash
+ 
+-if [ "$(uname)" == 'Darwin' ]; then
+-  OS='Mac'
+-elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
+-  OS='Linux'
+-else
+-  echo "Your platform ($(uname -a)) is not supported."
+-  exit 1
+-fi
+-
+-if [ "$(basename $0)" == 'atom-beta' ]; then
+-  BETA_VERSION=true
+-else
+-  BETA_VERSION=
+-fi
+-
+ export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
+ 
+ while getopts ":wtfvh-:" opt; do
+@@ -53,79 +38,22 @@
+   exec 2> /dev/null
+ fi
+ 
+-if [ $OS == 'Mac' ]; then
+-  if [ -L "$0" ]; then
+-    SCRIPT="$(readlink "$0")"
+-  else
+-    SCRIPT="$0"
+-  fi
+-  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
+-  if [ "$ATOM_APP" == . ]; then
+-    unset ATOM_APP
+-  else
+-    ATOM_PATH="$(dirname "$ATOM_APP")"
+-    ATOM_APP_NAME="$(basename "$ATOM_APP")"
+-  fi
+-
+-  if [ -n "$BETA_VERSION" ]; then
+-    ATOM_EXECUTABLE_NAME="Atom Beta"
+-  else
+-    ATOM_EXECUTABLE_NAME="Atom"
+-  fi
+-
+-  if [ -z "${ATOM_PATH}" ]; then
+-    # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
+-    if [ -x "/Applications/$ATOM_APP_NAME" ]; then
+-      ATOM_PATH="/Applications"
+-    elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
+-      ATOM_PATH="$HOME/Applications"
+-    else
+-      # We haven't found an Atom.app, use spotlight to search for Atom
+-      ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
+-
+-      # Exit if Atom can't be found
+-      if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
+-        echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
+-        exit 1
+-      fi
+-    fi
+-  fi
+-
+-  if [ $EXPECT_OUTPUT ]; then
+-    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
+-    exit $?
+-  else
+-    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
+-  fi
+-elif [ $OS == 'Linux' ]; then
+-  SCRIPT=$(readlink -f "$0")
+-  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
+-
+-  if [ -n "$BETA_VERSION" ]; then
+-    ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
+-  else
+-    ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
+-  fi
+-
+-  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
+-  mkdir -p "$ATOM_HOME"
+-
+-  : ${TMPDIR:=/tmp}
++ATOM_PATH="electron --app=/usr/lib/atom"
+ 
+-  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
++ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
++mkdir -p "$ATOM_HOME"
+ 
+-  if [ $EXPECT_OUTPUT ]; then
+-    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
++if [ $EXPECT_OUTPUT ]; then
++  $ATOM_PATH --executed-from="$(pwd)" --pid=$$ "$@"
++  exit $?
++else
++  (
++  nohup $ATOM_PATH --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
++  if [ $? -ne 0 ]; then
++    cat "$ATOM_HOME/nohup.out"
+     exit $?
+-  else
+-    (
+-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
+-    if [ $? -ne 0 ]; then
+-      cat "$ATOM_HOME/nohup.out"
+-      exit $?
+-    fi
+-    ) &
+   fi
++  ) &
+ fi
+ 
+ # Exits this process when Atom is used as $EDITOR

Deleted: community-i686/fix-license-path.patch
===================================================================
--- community-i686/fix-license-path.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-i686/fix-license-path.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,22 +0,0 @@
---- a/src/main-process/atom-application.coffee
-+++ b/src/main-process/atom-application.coffee
-@@ -266,7 +266,7 @@
-     @openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
-     @openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
-     @openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
--    @openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
-+    @openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
- 
-     @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
-       resolveBeforeQuitPromise = null
---- a/src/workspace.js
-+++ b/src/workspace.js
-@@ -1101,7 +1101,7 @@
- 
-   // Open Atom's license in the active pane.
-   openLicense () {
--    return this.open(path.join(process.resourcesPath, 'LICENSE.md'))
-+    return this.open('/usr/share/licenses/atom/LICENSE.md')
-   }
- 
-   // Synchronously open the given URI in the active pane. **Only use this method

Copied: atom/repos/community-i686/fix-license-path.patch (from rev 264978, atom/trunk/fix-license-path.patch)
===================================================================
--- community-i686/fix-license-path.patch	                        (rev 0)
+++ community-i686/fix-license-path.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,22 @@
+--- a/src/main-process/atom-application.coffee
++++ b/src/main-process/atom-application.coffee
+@@ -266,7 +266,7 @@
+     @openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
+     @openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
+     @openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
+-    @openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
++    @openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
+ 
+     @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
+       resolveBeforeQuitPromise = null
+--- a/src/workspace.js
++++ b/src/workspace.js
+@@ -1101,7 +1101,7 @@
+ 
+   // Open Atom's license in the active pane.
+   openLicense () {
+-    return this.open(path.join(process.resourcesPath, 'LICENSE.md'))
++    return this.open('/usr/share/licenses/atom/LICENSE.md')
+   }
+ 
+   // Synchronously open the given URI in the active pane. **Only use this method

Deleted: community-i686/fix-restart.patch
===================================================================
--- community-i686/fix-restart.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-i686/fix-restart.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,11 +0,0 @@
---- a/src/main-process/atom-application.coffee
-+++ b/src/main-process/atom-application.coffee
-@@ -829,7 +829,7 @@
-       @restart()
- 
-   restart: ->
--    args = []
-+    args = ["--app=/usr/lib/atom"]
-     args.push("--safe") if @safeMode
-     args.push("--log-file=#{@logFile}") if @logFile?
-     args.push("--socket-path=#{@socketPath}") if @socketPath?

Copied: atom/repos/community-i686/fix-restart.patch (from rev 264978, atom/trunk/fix-restart.patch)
===================================================================
--- community-i686/fix-restart.patch	                        (rev 0)
+++ community-i686/fix-restart.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,11 @@
+--- a/src/main-process/atom-application.coffee
++++ b/src/main-process/atom-application.coffee
+@@ -829,7 +829,7 @@
+       @restart()
+ 
+   restart: ->
+-    args = []
++    args = ["--app=/usr/lib/atom"]
+     args.push("--safe") if @safeMode
+     args.push("--log-file=#{@logFile}") if @logFile?
+     args.push("--socket-path=#{@socketPath}") if @socketPath?

Deleted: community-i686/symbols-view-use-system-ctags.patch
===================================================================
--- community-i686/symbols-view-use-system-ctags.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-i686/symbols-view-use-system-ctags.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,11 +0,0 @@
---- a/lib/tag-generator.js
-+++ b/lib/tag-generator.js
-@@ -79,7 +79,7 @@ export default class TagGenerator {
-   generate() {
-     let tags = {};
-     const packageRoot = this.getPackageRoot();
--    const command = path.join(packageRoot, 'vendor', `ctags-${process.platform}`);
-+    const command = 'ctags';
-     const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config');
-     const args = [`--options=${defaultCtagsFile}`, '--fields=+KS'];
- 

Copied: atom/repos/community-i686/symbols-view-use-system-ctags.patch (from rev 264978, atom/trunk/symbols-view-use-system-ctags.patch)
===================================================================
--- community-i686/symbols-view-use-system-ctags.patch	                        (rev 0)
+++ community-i686/symbols-view-use-system-ctags.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,11 @@
+--- a/lib/tag-generator.js
++++ b/lib/tag-generator.js
+@@ -79,7 +79,7 @@ export default class TagGenerator {
+   generate() {
+     let tags = {};
+     const packageRoot = this.getPackageRoot();
+-    const command = path.join(packageRoot, 'vendor', `ctags-${process.platform}`);
++    const command = 'ctags';
+     const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config');
+     const args = [`--options=${defaultCtagsFile}`, '--fields=+KS'];
+ 

Deleted: community-i686/use-system-apm.patch
===================================================================
--- community-i686/use-system-apm.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-i686/use-system-apm.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,32 +0,0 @@
---- a/script/lib/run-apm-install.js
-+++ b/script/lib/run-apm-install.js
-@@ -8,11 +8,8 @@
-   const installEnv = Object.assign({}, process.env)
-   // Set resource path so that apm can load metadata related to Atom.
-   installEnv.ATOM_RESOURCE_PATH = CONFIG.repositoryRootPath
--  // Set our target (Electron) version so that node-pre-gyp can download the
--  // proper binaries.
--  installEnv.npm_config_target = CONFIG.appMetadata.electronVersion
-   childProcess.execFileSync(
--    CONFIG.getApmBinPath(),
-+    'apm',
-     ['--loglevel=error', 'install'],
-     {env: installEnv, cwd: packagePath, stdio: 'inherit'}
-   )
---- a/src/package-manager.js
-+++ b/src/package-manager.js
-@@ -165,13 +165,7 @@
-       return configPath || this.apmPath
-     }
- 
--    const commandName = process.platform === 'win32' ? 'apm.cmd' : 'apm'
--    const apmRoot = path.join(process.resourcesPath, 'app', 'apm')
--    this.apmPath = path.join(apmRoot, 'bin', commandName)
--    if (!fs.isFileSync(this.apmPath)) {
--      this.apmPath = path.join(apmRoot, 'node_modules', 'atom-package-manager', 'bin', commandName)
--    }
--    return this.apmPath
-+    return '/usr/lib/node_modules/atom-package-manager/bin/apm'
-   }
- 
-   // Public: Get the paths being used to look for packages.

Copied: atom/repos/community-i686/use-system-apm.patch (from rev 264978, atom/trunk/use-system-apm.patch)
===================================================================
--- community-i686/use-system-apm.patch	                        (rev 0)
+++ community-i686/use-system-apm.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,32 @@
+--- a/script/lib/run-apm-install.js
++++ b/script/lib/run-apm-install.js
+@@ -8,11 +8,8 @@
+   const installEnv = Object.assign({}, process.env)
+   // Set resource path so that apm can load metadata related to Atom.
+   installEnv.ATOM_RESOURCE_PATH = CONFIG.repositoryRootPath
+-  // Set our target (Electron) version so that node-pre-gyp can download the
+-  // proper binaries.
+-  installEnv.npm_config_target = CONFIG.appMetadata.electronVersion
+   childProcess.execFileSync(
+-    CONFIG.getApmBinPath(),
++    'apm',
+     ['--loglevel=error', 'install'],
+     {env: installEnv, cwd: packagePath, stdio: 'inherit'}
+   )
+--- a/src/package-manager.js
++++ b/src/package-manager.js
+@@ -165,13 +165,7 @@
+       return configPath || this.apmPath
+     }
+ 
+-    const commandName = process.platform === 'win32' ? 'apm.cmd' : 'apm'
+-    const apmRoot = path.join(process.resourcesPath, 'app', 'apm')
+-    this.apmPath = path.join(apmRoot, 'bin', commandName)
+-    if (!fs.isFileSync(this.apmPath)) {
+-      this.apmPath = path.join(apmRoot, 'node_modules', 'atom-package-manager', 'bin', commandName)
+-    }
+-    return this.apmPath
++    return '/usr/lib/node_modules/atom-package-manager/bin/apm'
+   }
+ 
+   // Public: Get the paths being used to look for packages.

Deleted: community-i686/use-system-electron.patch
===================================================================
--- community-i686/use-system-electron.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-i686/use-system-electron.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,196 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -12,7 +12,6 @@
-     "url": "https://github.com/atom/atom/issues"
-   },
-   "license": "MIT",
--  "electronVersion": "1.6.15",
-   "dependencies": {
-     "@atom/source-map-support": "^0.3.4",
-     "async": "0.2.6",
---- a/script/build
-+++ b/script/build
-@@ -2,10 +2,6 @@
- 
- 'use strict'
- 
--// Run bootstrap first to ensure all the dependencies used later in this script
--// are installed.
--require('./bootstrap')
--
- // Needed so we can require src/module-cache.coffee during generateModuleCache
- require('coffee-script/register')
- require('colors')
-@@ -26,7 +22,6 @@
-   .wrap(yargs.terminalWidth())
-   .argv
- 
--const checkChromedriverVersion = require('./lib/check-chromedriver-version')
- const cleanOutputDirectory = require('./lib/clean-output-directory')
- const codeSignOnMac = require('./lib/code-sign-on-mac')
- const codeSignOnWindows = require('./lib/code-sign-on-windows')
-@@ -39,7 +34,6 @@
- const generateAPIDocs = require('./lib/generate-api-docs')
- const generateMetadata = require('./lib/generate-metadata')
- const generateModuleCache = require('./lib/generate-module-cache')
--const generateStartupSnapshot = require('./lib/generate-startup-snapshot')
- const installApplication = require('./lib/install-application')
- const packageApplication = require('./lib/package-application')
- const prebuildLessCache = require('./lib/prebuild-less-cache')
-@@ -58,7 +52,6 @@
- let binariesPromise = Promise.resolve()
- 
- if (!argv.existingBinaries) {
--  checkChromedriverVersion()
-   cleanOutputDirectory()
-   copyAssets()
-   transpilePackagesWithCustomTranspilerPaths()
-@@ -72,63 +65,3 @@
-   generateAPIDocs()
-   binariesPromise = dumpSymbols()
- }
--
--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)
--        }
--      }
--      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) {
--          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)
--        }
--
--        if (argv.createRpmPackage) {
--          createRpmPackage(packagedAppPath)
--        } else {
--          console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.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)
--    }
--  })
---- a/script/package.json
-+++ b/script/package.json
-@@ -8,9 +8,6 @@
-     "colors": "1.1.2",
-     "csslint": "1.0.2",
-     "donna": "1.0.16",
--    "electron-chromedriver": "~1.6",
--    "electron-link": "0.1.1",
--    "electron-mksnapshot": "~1.6",
-     "electron-packager": "7.3.0",
-     "electron-winstaller": "2.6.3",
-     "fs-admin": "^0.1.5",
---- a/src/compile-cache.js
-+++ b/src/compile-cache.js
-@@ -121,7 +121,7 @@
-       return {
-         column,
-         line: row,
--        source: path.join(resourcesPath, 'app', 'static', relativePath),
-+        source: path.join(resourcesPath, 'static', relativePath),
-         name: null
-       }
-     }
---- a/src/main-process/start.js
-+++ b/src/main-process/start.js
-@@ -85,5 +85,5 @@
- function setupCompileCache () {
-   const CompileCache = require('../compile-cache')
-   CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
--  CompileCache.install(process.resourcesPath, require)
-+  CompileCache.install('/usr/lib/atom', require)
- }
---- a/src/module-cache.coffee
-+++ b/src/module-cache.coffee
-@@ -195,7 +195,7 @@
-   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)
---- a/src/package-manager.js
-+++ b/src/package-manager.js
-@@ -802,7 +802,7 @@
-   }
- 
-   isBundledPackagePath (packagePath) {
--    if (this.devMode && !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) {
-+    if (this.devMode && this.resourcePath !== '/usr/lib/atom') {
-       return false
-     }
- 
---- a/src/task-bootstrap.js
-+++ b/src/task-bootstrap.js
-@@ -3,7 +3,7 @@
- 
- const CompileCache = require('./compile-cache')
- CompileCache.setCacheDirectory(compileCachePath)
--CompileCache.install(`${process.resourcesPath}`, require)
-+CompileCache.install('/usr/lib/atom', require)
- 
- const setupGlobals = function () {
-   global.attachEvent = function () {}
---- a/static/index.js
-+++ b/static/index.js
-@@ -23,7 +23,7 @@
-       process.resourcesPath = path.normalize(process.resourcesPath)
- 
-       setupAtomHome()
--      const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith(process.resourcesPath + path.sep)
-+      const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith('/usr/lib/atom')
-       useSnapshot = !devMode && typeof snapshotResult !== 'undefined'
- 
-       if (devMode) {
-@@ -90,7 +90,7 @@
-   function setupWindow () {
-     const CompileCache = useSnapshot ? snapshotResult.customRequire('../src/compile-cache.js') : require('../src/compile-cache')
-     CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
--    CompileCache.install(process.resourcesPath, require)
-+    CompileCache.install('/usr/lib/atom', require)
- 
-     const ModuleCache = useSnapshot ? snapshotResult.customRequire('../src/module-cache.js') : require('../src/module-cache')
-     ModuleCache.register(getWindowLoadSettings())

Copied: atom/repos/community-i686/use-system-electron.patch (from rev 264978, atom/trunk/use-system-electron.patch)
===================================================================
--- community-i686/use-system-electron.patch	                        (rev 0)
+++ community-i686/use-system-electron.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,196 @@
+--- a/package.json
++++ b/package.json
+@@ -12,7 +12,6 @@
+     "url": "https://github.com/atom/atom/issues"
+   },
+   "license": "MIT",
+-  "electronVersion": "1.6.15",
+   "dependencies": {
+     "@atom/nsfw": "^1.0.18",
+     "@atom/source-map-support": "^0.3.4",
+--- a/script/build
++++ b/script/build
+@@ -2,10 +2,6 @@
+ 
+ 'use strict'
+ 
+-// Run bootstrap first to ensure all the dependencies used later in this script
+-// are installed.
+-require('./bootstrap')
+-
+ // Needed so we can require src/module-cache.coffee during generateModuleCache
+ require('coffee-script/register')
+ require('colors')
+@@ -26,7 +22,6 @@
+   .wrap(yargs.terminalWidth())
+   .argv
+ 
+-const checkChromedriverVersion = require('./lib/check-chromedriver-version')
+ const cleanOutputDirectory = require('./lib/clean-output-directory')
+ const codeSignOnMac = require('./lib/code-sign-on-mac')
+ const codeSignOnWindows = require('./lib/code-sign-on-windows')
+@@ -39,7 +34,6 @@
+ const generateAPIDocs = require('./lib/generate-api-docs')
+ const generateMetadata = require('./lib/generate-metadata')
+ const generateModuleCache = require('./lib/generate-module-cache')
+-const generateStartupSnapshot = require('./lib/generate-startup-snapshot')
+ const installApplication = require('./lib/install-application')
+ const packageApplication = require('./lib/package-application')
+ const prebuildLessCache = require('./lib/prebuild-less-cache')
+@@ -58,7 +52,6 @@
+ let binariesPromise = Promise.resolve()
+ 
+ if (!argv.existingBinaries) {
+-  checkChromedriverVersion()
+   cleanOutputDirectory()
+   copyAssets()
+   transpilePackagesWithCustomTranspilerPaths()
+@@ -72,63 +65,3 @@
+   generateAPIDocs()
+   binariesPromise = dumpSymbols()
+ }
+-
+-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)
+-        }
+-      }
+-      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) {
+-          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)
+-        }
+-
+-        if (argv.createRpmPackage) {
+-          createRpmPackage(packagedAppPath)
+-        } else {
+-          console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.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)
+-    }
+-  })
+--- a/script/package.json
++++ b/script/package.json
+@@ -8,9 +8,6 @@
+     "colors": "1.1.2",
+     "csslint": "1.0.2",
+     "donna": "1.0.16",
+-    "electron-chromedriver": "~1.6",
+-    "electron-link": "0.1.1",
+-    "electron-mksnapshot": "~1.6",
+     "electron-packager": "7.3.0",
+     "electron-winstaller": "2.6.3",
+     "fs-admin": "^0.1.5",
+--- a/src/compile-cache.js
++++ b/src/compile-cache.js
+@@ -121,7 +121,7 @@
+       return {
+         column,
+         line: row,
+-        source: path.join(resourcesPath, 'app', 'static', relativePath),
++        source: path.join(resourcesPath, 'static', relativePath),
+         name: null
+       }
+     }
+--- a/src/main-process/start.js
++++ b/src/main-process/start.js
+@@ -85,5 +85,5 @@
+ function setupCompileCache () {
+   const CompileCache = require('../compile-cache')
+   CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
+-  CompileCache.install(process.resourcesPath, require)
++  CompileCache.install('/usr/lib/atom', require)
+ }
+--- a/src/module-cache.coffee
++++ b/src/module-cache.coffee
+@@ -195,7 +195,7 @@
+   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)
+--- a/src/package-manager.js
++++ b/src/package-manager.js
+@@ -802,7 +802,7 @@
+   }
+ 
+   isBundledPackagePath (packagePath) {
+-    if (this.devMode && !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) {
++    if (this.devMode && this.resourcePath !== '/usr/lib/atom') {
+       return false
+     }
+ 
+--- a/src/task-bootstrap.js
++++ b/src/task-bootstrap.js
+@@ -3,7 +3,7 @@
+ 
+ const CompileCache = require('./compile-cache')
+ CompileCache.setCacheDirectory(compileCachePath)
+-CompileCache.install(`${process.resourcesPath}`, require)
++CompileCache.install('/usr/lib/atom', require)
+ 
+ const setupGlobals = function () {
+   global.attachEvent = function () {}
+--- a/static/index.js
++++ b/static/index.js
+@@ -23,7 +23,7 @@
+       process.resourcesPath = path.normalize(process.resourcesPath)
+ 
+       setupAtomHome()
+-      const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith(process.resourcesPath + path.sep)
++      const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith('/usr/lib/atom')
+       useSnapshot = !devMode && typeof snapshotResult !== 'undefined'
+ 
+       if (devMode) {
+@@ -90,7 +90,7 @@
+   function setupWindow () {
+     const CompileCache = useSnapshot ? snapshotResult.customRequire('../src/compile-cache.js') : require('../src/compile-cache')
+     CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
+-    CompileCache.install(process.resourcesPath, require)
++    CompileCache.install('/usr/lib/atom', require)
+ 
+     const ModuleCache = useSnapshot ? snapshotResult.customRequire('../src/module-cache.js') : require('../src/module-cache')
+     ModuleCache.register(getWindowLoadSettings())

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-x86_64/PKGBUILD	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,108 +0,0 @@
-# $Id$
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=atom
-pkgver=1.21.1
-pkgrel=1
-pkgdesc='A hackable text editor for the 21st Century'
-arch=('i686' 'x86_64')
-url='https://github.com/atom/atom'
-license=('MIT' 'custom')
-depends=('apm' 'electron' 'libxkbfile')
-makedepends=('git' 'npm')
-optdepends=('ctags: symbol indexing support'
-            'git: Git and GitHub integration')
-replaces=('atom-editor')
-options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
-        'dugite-use-system-git.patch'
-        'fix-atom-sh.patch'
-        'fix-license-path.patch'
-        'fix-restart.patch'
-        'symbols-view-use-system-ctags.patch'
-        'use-system-apm.patch'
-        'use-system-electron.patch')
-sha256sums=('537cbb6be91d3bd2a7b6372c14b95b8ae07ee8bc06d608bcab8a3dc93a6cc88d'
-            'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba'
-            '7f4f86387d226fcd452f0b97579dadc3eac217a77485228dbf4facf3391b6198'
-            '951bbc248c9ae4ef3ef712e0caeb728a8577b12e4593870569de15e570a71c4c'
-            '646f81b0621a86eff3bb1f229eeb92b2f33bac41b3324424a6de06a780a8a22d'
-            '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
-            'c120739911ce6a455a642c97d4d7de0956abee4d94bfc338f8a13f771a2d381c'
-            '13ee051e304cb8e612d5e910dc9a3e73b5d993df9afce2f2d22d2d24a9e938c7')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}"/fix-atom-sh.patch
-  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-restart.patch
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${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
-  apm install
-
-  # Use system ctags
-  cd node_modules/symbols-view
-  patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch
-  rm -r vendor
-  cd ../..
-
-  # Use system git (TODO: set LOCAL_GIT_DIRECTORY=/usr)
-  cd node_modules/dugite
-  patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch
-  rm -r git
-  cd ../..
-
-  cd script
-  npm install
-  ./build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -d -m 755 "${pkgdir}"/usr/lib
-  cp -r out/app "${pkgdir}"/usr/lib/atom
-
-  install -d -m 755 "${pkgdir}/usr/share/applications"
-  sed -e "s|<%= appName %>|Atom|" \
-      -e "s/<%= description %>/${pkgdesc}/" \
-      -e "s|<%= installDir %>/share/<%= appFileName %>/atom|electron --app=/usr/lib/atom|" \
-      -e "s|<%= iconPath %>|atom|" \
-      resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
-
-  for size in 16 24 32 48 64 128 256 512 1024; do
-    install -D -m 644 resources/app-icons/stable/png/${size}.png \
-            "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/atom.png
-  done
-  ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
-      "${pkgdir}"/usr/lib/atom/resources/atom.png
-
-  install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
-
-  install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  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 '{}' \; \
-      -or -name "*.node" -exec chmod a-x '{}' \; \
-      -or -name "benchmark" -prune -exec rm -r '{}' \; \
-      -or -name "doc" -prune -exec rm -r '{}' \; \
-      -or -name "html" -prune -exec rm -r '{}' \; \
-      -or -name "man" -prune -exec rm -r '{}' \; \
-      -or -name "scripts" -prune -exec rm -r '{}' \; \
-      -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
-      -or -path "*/task-lists/src" -prune -exec rm -r '{}' \;
-}

Copied: atom/repos/community-x86_64/PKGBUILD (from rev 264978, atom/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=atom
+pkgver=1.21.2
+pkgrel=1
+pkgdesc='A hackable text editor for the 21st Century'
+arch=('i686' 'x86_64')
+url='https://github.com/atom/atom'
+license=('MIT' 'custom')
+depends=('apm' 'electron' 'libxkbfile')
+makedepends=('git' 'npm')
+optdepends=('ctags: symbol indexing support'
+            'git: Git and GitHub integration')
+replaces=('atom-editor')
+options=(!emptydirs)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
+        'dugite-use-system-git.patch'
+        'fix-atom-sh.patch'
+        'fix-license-path.patch'
+        'fix-restart.patch'
+        'symbols-view-use-system-ctags.patch'
+        'use-system-apm.patch'
+        'use-system-electron.patch')
+sha256sums=('1aff8c81d366c4d0a2a3767ee34512ffc3504265a430b93c6c7569cddc988c28'
+            'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba'
+            '7f4f86387d226fcd452f0b97579dadc3eac217a77485228dbf4facf3391b6198'
+            '951bbc248c9ae4ef3ef712e0caeb728a8577b12e4593870569de15e570a71c4c'
+            '646f81b0621a86eff3bb1f229eeb92b2f33bac41b3324424a6de06a780a8a22d'
+            '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
+            'c120739911ce6a455a642c97d4d7de0956abee4d94bfc338f8a13f771a2d381c'
+            'e957bf927dc39b434167fecf6bdd01d78f9c6f71f24bcf86fa2d89dc254a7f96')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}"/fix-atom-sh.patch
+  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-restart.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${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
+  apm install
+
+  # Use system ctags
+  cd node_modules/symbols-view
+  patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch
+  rm -r vendor
+  cd ../..
+
+  # Use system git (TODO: set LOCAL_GIT_DIRECTORY=/usr)
+  cd node_modules/dugite
+  patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch
+  rm -r git
+  cd ../..
+
+  cd script
+  npm install
+  ./build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -d -m 755 "${pkgdir}"/usr/lib
+  cp -r out/app "${pkgdir}"/usr/lib/atom
+
+  install -d -m 755 "${pkgdir}/usr/share/applications"
+  sed -e "s|<%= appName %>|Atom|" \
+      -e "s/<%= description %>/${pkgdesc}/" \
+      -e "s|<%= installDir %>/share/<%= appFileName %>/atom|electron --app=/usr/lib/atom|" \
+      -e "s|<%= iconPath %>|atom|" \
+      resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
+
+  for size in 16 24 32 48 64 128 256 512 1024; do
+    install -D -m 644 resources/app-icons/stable/png/${size}.png \
+            "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/atom.png
+  done
+  ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
+      "${pkgdir}"/usr/lib/atom/resources/atom.png
+
+  install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
+
+  install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  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 '{}' \; \
+      -or -name "*.node" -exec chmod a-x '{}' \; \
+      -or -name "benchmark" -prune -exec rm -r '{}' \; \
+      -or -name "doc" -prune -exec rm -r '{}' \; \
+      -or -name "html" -prune -exec rm -r '{}' \; \
+      -or -name "man" -prune -exec rm -r '{}' \; \
+      -or -name "scripts" -prune -exec rm -r '{}' \; \
+      -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
+      -or -path "*/task-lists/src" -prune -exec rm -r '{}' \;
+}

Deleted: community-x86_64/dugite-use-system-git.patch
===================================================================
--- community-x86_64/dugite-use-system-git.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-x86_64/dugite-use-system-git.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,24 +0,0 @@
---- a/build/lib/git-environment.js
-+++ b/build/lib/git-environment.js
-@@ -18,7 +18,7 @@
-         return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
-     }
-     else {
--        return resolveEmbeddedGitDir();
-+        return '/usr';
-     }
- }
- /**
-@@ -96,9 +96,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
--            const distDir = resolveEmbeddedGitDir();
--            const sslCABundle = `${distDir}/ssl/cacert.pem`;
--            env.GIT_SSL_CAINFO = sslCABundle;
-+            // const distDir = resolveEmbeddedGitDir();
-+            // const sslCABundle = `${distDir}/ssl/cacert.pem`;
-+            // env.GIT_SSL_CAINFO = sslCABundle;
-         }
-     }
-     return { env, gitLocation };

Copied: atom/repos/community-x86_64/dugite-use-system-git.patch (from rev 264978, atom/trunk/dugite-use-system-git.patch)
===================================================================
--- community-x86_64/dugite-use-system-git.patch	                        (rev 0)
+++ community-x86_64/dugite-use-system-git.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,24 @@
+--- a/build/lib/git-environment.js
++++ b/build/lib/git-environment.js
+@@ -18,7 +18,7 @@
+         return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
+     }
+     else {
+-        return resolveEmbeddedGitDir();
++        return '/usr';
+     }
+ }
+ /**
+@@ -96,9 +96,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
+-            const distDir = resolveEmbeddedGitDir();
+-            const sslCABundle = `${distDir}/ssl/cacert.pem`;
+-            env.GIT_SSL_CAINFO = sslCABundle;
++            // const distDir = resolveEmbeddedGitDir();
++            // const sslCABundle = `${distDir}/ssl/cacert.pem`;
++            // env.GIT_SSL_CAINFO = sslCABundle;
+         }
+     }
+     return { env, gitLocation };

Deleted: community-x86_64/fix-atom-sh.patch
===================================================================
--- community-x86_64/fix-atom-sh.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-x86_64/fix-atom-sh.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,115 +0,0 @@
---- a/atom.sh
-+++ b/atom.sh
-@@ -1,20 +1,5 @@
- #!/bin/bash
- 
--if [ "$(uname)" == 'Darwin' ]; then
--  OS='Mac'
--elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
--  OS='Linux'
--else
--  echo "Your platform ($(uname -a)) is not supported."
--  exit 1
--fi
--
--if [ "$(basename $0)" == 'atom-beta' ]; then
--  BETA_VERSION=true
--else
--  BETA_VERSION=
--fi
--
- export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
- 
- while getopts ":wtfvh-:" opt; do
-@@ -53,79 +38,22 @@
-   exec 2> /dev/null
- fi
- 
--if [ $OS == 'Mac' ]; then
--  if [ -L "$0" ]; then
--    SCRIPT="$(readlink "$0")"
--  else
--    SCRIPT="$0"
--  fi
--  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
--  if [ "$ATOM_APP" == . ]; then
--    unset ATOM_APP
--  else
--    ATOM_PATH="$(dirname "$ATOM_APP")"
--    ATOM_APP_NAME="$(basename "$ATOM_APP")"
--  fi
--
--  if [ -n "$BETA_VERSION" ]; then
--    ATOM_EXECUTABLE_NAME="Atom Beta"
--  else
--    ATOM_EXECUTABLE_NAME="Atom"
--  fi
--
--  if [ -z "${ATOM_PATH}" ]; then
--    # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
--    if [ -x "/Applications/$ATOM_APP_NAME" ]; then
--      ATOM_PATH="/Applications"
--    elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
--      ATOM_PATH="$HOME/Applications"
--    else
--      # We haven't found an Atom.app, use spotlight to search for Atom
--      ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
--
--      # Exit if Atom can't be found
--      if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
--        echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
--        exit 1
--      fi
--    fi
--  fi
--
--  if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
--    exit $?
--  else
--    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
--  fi
--elif [ $OS == 'Linux' ]; then
--  SCRIPT=$(readlink -f "$0")
--  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
--
--  if [ -n "$BETA_VERSION" ]; then
--    ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
--  else
--    ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
--  fi
--
--  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
--  mkdir -p "$ATOM_HOME"
--
--  : ${TMPDIR:=/tmp}
-+ATOM_PATH="electron --app=/usr/lib/atom"
- 
--  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
-+ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
-+mkdir -p "$ATOM_HOME"
- 
--  if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+if [ $EXPECT_OUTPUT ]; then
-+  $ATOM_PATH --executed-from="$(pwd)" --pid=$$ "$@"
-+  exit $?
-+else
-+  (
-+  nohup $ATOM_PATH --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+  if [ $? -ne 0 ]; then
-+    cat "$ATOM_HOME/nohup.out"
-     exit $?
--  else
--    (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
--    if [ $? -ne 0 ]; then
--      cat "$ATOM_HOME/nohup.out"
--      exit $?
--    fi
--    ) &
-   fi
-+  ) &
- fi
- 
- # Exits this process when Atom is used as $EDITOR

Copied: atom/repos/community-x86_64/fix-atom-sh.patch (from rev 264978, atom/trunk/fix-atom-sh.patch)
===================================================================
--- community-x86_64/fix-atom-sh.patch	                        (rev 0)
+++ community-x86_64/fix-atom-sh.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,115 @@
+--- a/atom.sh
++++ b/atom.sh
+@@ -1,20 +1,5 @@
+ #!/bin/bash
+ 
+-if [ "$(uname)" == 'Darwin' ]; then
+-  OS='Mac'
+-elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
+-  OS='Linux'
+-else
+-  echo "Your platform ($(uname -a)) is not supported."
+-  exit 1
+-fi
+-
+-if [ "$(basename $0)" == 'atom-beta' ]; then
+-  BETA_VERSION=true
+-else
+-  BETA_VERSION=
+-fi
+-
+ export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
+ 
+ while getopts ":wtfvh-:" opt; do
+@@ -53,79 +38,22 @@
+   exec 2> /dev/null
+ fi
+ 
+-if [ $OS == 'Mac' ]; then
+-  if [ -L "$0" ]; then
+-    SCRIPT="$(readlink "$0")"
+-  else
+-    SCRIPT="$0"
+-  fi
+-  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
+-  if [ "$ATOM_APP" == . ]; then
+-    unset ATOM_APP
+-  else
+-    ATOM_PATH="$(dirname "$ATOM_APP")"
+-    ATOM_APP_NAME="$(basename "$ATOM_APP")"
+-  fi
+-
+-  if [ -n "$BETA_VERSION" ]; then
+-    ATOM_EXECUTABLE_NAME="Atom Beta"
+-  else
+-    ATOM_EXECUTABLE_NAME="Atom"
+-  fi
+-
+-  if [ -z "${ATOM_PATH}" ]; then
+-    # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
+-    if [ -x "/Applications/$ATOM_APP_NAME" ]; then
+-      ATOM_PATH="/Applications"
+-    elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
+-      ATOM_PATH="$HOME/Applications"
+-    else
+-      # We haven't found an Atom.app, use spotlight to search for Atom
+-      ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
+-
+-      # Exit if Atom can't be found
+-      if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
+-        echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
+-        exit 1
+-      fi
+-    fi
+-  fi
+-
+-  if [ $EXPECT_OUTPUT ]; then
+-    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
+-    exit $?
+-  else
+-    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
+-  fi
+-elif [ $OS == 'Linux' ]; then
+-  SCRIPT=$(readlink -f "$0")
+-  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
+-
+-  if [ -n "$BETA_VERSION" ]; then
+-    ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
+-  else
+-    ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
+-  fi
+-
+-  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
+-  mkdir -p "$ATOM_HOME"
+-
+-  : ${TMPDIR:=/tmp}
++ATOM_PATH="electron --app=/usr/lib/atom"
+ 
+-  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
++ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
++mkdir -p "$ATOM_HOME"
+ 
+-  if [ $EXPECT_OUTPUT ]; then
+-    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
++if [ $EXPECT_OUTPUT ]; then
++  $ATOM_PATH --executed-from="$(pwd)" --pid=$$ "$@"
++  exit $?
++else
++  (
++  nohup $ATOM_PATH --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
++  if [ $? -ne 0 ]; then
++    cat "$ATOM_HOME/nohup.out"
+     exit $?
+-  else
+-    (
+-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
+-    if [ $? -ne 0 ]; then
+-      cat "$ATOM_HOME/nohup.out"
+-      exit $?
+-    fi
+-    ) &
+   fi
++  ) &
+ fi
+ 
+ # Exits this process when Atom is used as $EDITOR

Deleted: community-x86_64/fix-license-path.patch
===================================================================
--- community-x86_64/fix-license-path.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-x86_64/fix-license-path.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,22 +0,0 @@
---- a/src/main-process/atom-application.coffee
-+++ b/src/main-process/atom-application.coffee
-@@ -266,7 +266,7 @@
-     @openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
-     @openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
-     @openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
--    @openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
-+    @openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
- 
-     @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
-       resolveBeforeQuitPromise = null
---- a/src/workspace.js
-+++ b/src/workspace.js
-@@ -1101,7 +1101,7 @@
- 
-   // Open Atom's license in the active pane.
-   openLicense () {
--    return this.open(path.join(process.resourcesPath, 'LICENSE.md'))
-+    return this.open('/usr/share/licenses/atom/LICENSE.md')
-   }
- 
-   // Synchronously open the given URI in the active pane. **Only use this method

Copied: atom/repos/community-x86_64/fix-license-path.patch (from rev 264978, atom/trunk/fix-license-path.patch)
===================================================================
--- community-x86_64/fix-license-path.patch	                        (rev 0)
+++ community-x86_64/fix-license-path.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,22 @@
+--- a/src/main-process/atom-application.coffee
++++ b/src/main-process/atom-application.coffee
+@@ -266,7 +266,7 @@
+     @openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
+     @openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
+     @openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
+-    @openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
++    @openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
+ 
+     @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
+       resolveBeforeQuitPromise = null
+--- a/src/workspace.js
++++ b/src/workspace.js
+@@ -1101,7 +1101,7 @@
+ 
+   // Open Atom's license in the active pane.
+   openLicense () {
+-    return this.open(path.join(process.resourcesPath, 'LICENSE.md'))
++    return this.open('/usr/share/licenses/atom/LICENSE.md')
+   }
+ 
+   // Synchronously open the given URI in the active pane. **Only use this method

Deleted: community-x86_64/fix-restart.patch
===================================================================
--- community-x86_64/fix-restart.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-x86_64/fix-restart.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,11 +0,0 @@
---- a/src/main-process/atom-application.coffee
-+++ b/src/main-process/atom-application.coffee
-@@ -829,7 +829,7 @@
-       @restart()
- 
-   restart: ->
--    args = []
-+    args = ["--app=/usr/lib/atom"]
-     args.push("--safe") if @safeMode
-     args.push("--log-file=#{@logFile}") if @logFile?
-     args.push("--socket-path=#{@socketPath}") if @socketPath?

Copied: atom/repos/community-x86_64/fix-restart.patch (from rev 264978, atom/trunk/fix-restart.patch)
===================================================================
--- community-x86_64/fix-restart.patch	                        (rev 0)
+++ community-x86_64/fix-restart.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,11 @@
+--- a/src/main-process/atom-application.coffee
++++ b/src/main-process/atom-application.coffee
+@@ -829,7 +829,7 @@
+       @restart()
+ 
+   restart: ->
+-    args = []
++    args = ["--app=/usr/lib/atom"]
+     args.push("--safe") if @safeMode
+     args.push("--log-file=#{@logFile}") if @logFile?
+     args.push("--socket-path=#{@socketPath}") if @socketPath?

Deleted: community-x86_64/symbols-view-use-system-ctags.patch
===================================================================
--- community-x86_64/symbols-view-use-system-ctags.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-x86_64/symbols-view-use-system-ctags.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,11 +0,0 @@
---- a/lib/tag-generator.js
-+++ b/lib/tag-generator.js
-@@ -79,7 +79,7 @@ export default class TagGenerator {
-   generate() {
-     let tags = {};
-     const packageRoot = this.getPackageRoot();
--    const command = path.join(packageRoot, 'vendor', `ctags-${process.platform}`);
-+    const command = 'ctags';
-     const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config');
-     const args = [`--options=${defaultCtagsFile}`, '--fields=+KS'];
- 

Copied: atom/repos/community-x86_64/symbols-view-use-system-ctags.patch (from rev 264978, atom/trunk/symbols-view-use-system-ctags.patch)
===================================================================
--- community-x86_64/symbols-view-use-system-ctags.patch	                        (rev 0)
+++ community-x86_64/symbols-view-use-system-ctags.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,11 @@
+--- a/lib/tag-generator.js
++++ b/lib/tag-generator.js
+@@ -79,7 +79,7 @@ export default class TagGenerator {
+   generate() {
+     let tags = {};
+     const packageRoot = this.getPackageRoot();
+-    const command = path.join(packageRoot, 'vendor', `ctags-${process.platform}`);
++    const command = 'ctags';
+     const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config');
+     const args = [`--options=${defaultCtagsFile}`, '--fields=+KS'];
+ 

Deleted: community-x86_64/use-system-apm.patch
===================================================================
--- community-x86_64/use-system-apm.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-x86_64/use-system-apm.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,32 +0,0 @@
---- a/script/lib/run-apm-install.js
-+++ b/script/lib/run-apm-install.js
-@@ -8,11 +8,8 @@
-   const installEnv = Object.assign({}, process.env)
-   // Set resource path so that apm can load metadata related to Atom.
-   installEnv.ATOM_RESOURCE_PATH = CONFIG.repositoryRootPath
--  // Set our target (Electron) version so that node-pre-gyp can download the
--  // proper binaries.
--  installEnv.npm_config_target = CONFIG.appMetadata.electronVersion
-   childProcess.execFileSync(
--    CONFIG.getApmBinPath(),
-+    'apm',
-     ['--loglevel=error', 'install'],
-     {env: installEnv, cwd: packagePath, stdio: 'inherit'}
-   )
---- a/src/package-manager.js
-+++ b/src/package-manager.js
-@@ -165,13 +165,7 @@
-       return configPath || this.apmPath
-     }
- 
--    const commandName = process.platform === 'win32' ? 'apm.cmd' : 'apm'
--    const apmRoot = path.join(process.resourcesPath, 'app', 'apm')
--    this.apmPath = path.join(apmRoot, 'bin', commandName)
--    if (!fs.isFileSync(this.apmPath)) {
--      this.apmPath = path.join(apmRoot, 'node_modules', 'atom-package-manager', 'bin', commandName)
--    }
--    return this.apmPath
-+    return '/usr/lib/node_modules/atom-package-manager/bin/apm'
-   }
- 
-   // Public: Get the paths being used to look for packages.

Copied: atom/repos/community-x86_64/use-system-apm.patch (from rev 264978, atom/trunk/use-system-apm.patch)
===================================================================
--- community-x86_64/use-system-apm.patch	                        (rev 0)
+++ community-x86_64/use-system-apm.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,32 @@
+--- a/script/lib/run-apm-install.js
++++ b/script/lib/run-apm-install.js
+@@ -8,11 +8,8 @@
+   const installEnv = Object.assign({}, process.env)
+   // Set resource path so that apm can load metadata related to Atom.
+   installEnv.ATOM_RESOURCE_PATH = CONFIG.repositoryRootPath
+-  // Set our target (Electron) version so that node-pre-gyp can download the
+-  // proper binaries.
+-  installEnv.npm_config_target = CONFIG.appMetadata.electronVersion
+   childProcess.execFileSync(
+-    CONFIG.getApmBinPath(),
++    'apm',
+     ['--loglevel=error', 'install'],
+     {env: installEnv, cwd: packagePath, stdio: 'inherit'}
+   )
+--- a/src/package-manager.js
++++ b/src/package-manager.js
+@@ -165,13 +165,7 @@
+       return configPath || this.apmPath
+     }
+ 
+-    const commandName = process.platform === 'win32' ? 'apm.cmd' : 'apm'
+-    const apmRoot = path.join(process.resourcesPath, 'app', 'apm')
+-    this.apmPath = path.join(apmRoot, 'bin', commandName)
+-    if (!fs.isFileSync(this.apmPath)) {
+-      this.apmPath = path.join(apmRoot, 'node_modules', 'atom-package-manager', 'bin', commandName)
+-    }
+-    return this.apmPath
++    return '/usr/lib/node_modules/atom-package-manager/bin/apm'
+   }
+ 
+   // Public: Get the paths being used to look for packages.

Deleted: community-x86_64/use-system-electron.patch
===================================================================
--- community-x86_64/use-system-electron.patch	2017-11-01 10:19:51 UTC (rev 264978)
+++ community-x86_64/use-system-electron.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -1,196 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -12,7 +12,6 @@
-     "url": "https://github.com/atom/atom/issues"
-   },
-   "license": "MIT",
--  "electronVersion": "1.6.15",
-   "dependencies": {
-     "@atom/source-map-support": "^0.3.4",
-     "async": "0.2.6",
---- a/script/build
-+++ b/script/build
-@@ -2,10 +2,6 @@
- 
- 'use strict'
- 
--// Run bootstrap first to ensure all the dependencies used later in this script
--// are installed.
--require('./bootstrap')
--
- // Needed so we can require src/module-cache.coffee during generateModuleCache
- require('coffee-script/register')
- require('colors')
-@@ -26,7 +22,6 @@
-   .wrap(yargs.terminalWidth())
-   .argv
- 
--const checkChromedriverVersion = require('./lib/check-chromedriver-version')
- const cleanOutputDirectory = require('./lib/clean-output-directory')
- const codeSignOnMac = require('./lib/code-sign-on-mac')
- const codeSignOnWindows = require('./lib/code-sign-on-windows')
-@@ -39,7 +34,6 @@
- const generateAPIDocs = require('./lib/generate-api-docs')
- const generateMetadata = require('./lib/generate-metadata')
- const generateModuleCache = require('./lib/generate-module-cache')
--const generateStartupSnapshot = require('./lib/generate-startup-snapshot')
- const installApplication = require('./lib/install-application')
- const packageApplication = require('./lib/package-application')
- const prebuildLessCache = require('./lib/prebuild-less-cache')
-@@ -58,7 +52,6 @@
- let binariesPromise = Promise.resolve()
- 
- if (!argv.existingBinaries) {
--  checkChromedriverVersion()
-   cleanOutputDirectory()
-   copyAssets()
-   transpilePackagesWithCustomTranspilerPaths()
-@@ -72,63 +65,3 @@
-   generateAPIDocs()
-   binariesPromise = dumpSymbols()
- }
--
--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)
--        }
--      }
--      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) {
--          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)
--        }
--
--        if (argv.createRpmPackage) {
--          createRpmPackage(packagedAppPath)
--        } else {
--          console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.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)
--    }
--  })
---- a/script/package.json
-+++ b/script/package.json
-@@ -8,9 +8,6 @@
-     "colors": "1.1.2",
-     "csslint": "1.0.2",
-     "donna": "1.0.16",
--    "electron-chromedriver": "~1.6",
--    "electron-link": "0.1.1",
--    "electron-mksnapshot": "~1.6",
-     "electron-packager": "7.3.0",
-     "electron-winstaller": "2.6.3",
-     "fs-admin": "^0.1.5",
---- a/src/compile-cache.js
-+++ b/src/compile-cache.js
-@@ -121,7 +121,7 @@
-       return {
-         column,
-         line: row,
--        source: path.join(resourcesPath, 'app', 'static', relativePath),
-+        source: path.join(resourcesPath, 'static', relativePath),
-         name: null
-       }
-     }
---- a/src/main-process/start.js
-+++ b/src/main-process/start.js
-@@ -85,5 +85,5 @@
- function setupCompileCache () {
-   const CompileCache = require('../compile-cache')
-   CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
--  CompileCache.install(process.resourcesPath, require)
-+  CompileCache.install('/usr/lib/atom', require)
- }
---- a/src/module-cache.coffee
-+++ b/src/module-cache.coffee
-@@ -195,7 +195,7 @@
-   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)
---- a/src/package-manager.js
-+++ b/src/package-manager.js
-@@ -802,7 +802,7 @@
-   }
- 
-   isBundledPackagePath (packagePath) {
--    if (this.devMode && !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) {
-+    if (this.devMode && this.resourcePath !== '/usr/lib/atom') {
-       return false
-     }
- 
---- a/src/task-bootstrap.js
-+++ b/src/task-bootstrap.js
-@@ -3,7 +3,7 @@
- 
- const CompileCache = require('./compile-cache')
- CompileCache.setCacheDirectory(compileCachePath)
--CompileCache.install(`${process.resourcesPath}`, require)
-+CompileCache.install('/usr/lib/atom', require)
- 
- const setupGlobals = function () {
-   global.attachEvent = function () {}
---- a/static/index.js
-+++ b/static/index.js
-@@ -23,7 +23,7 @@
-       process.resourcesPath = path.normalize(process.resourcesPath)
- 
-       setupAtomHome()
--      const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith(process.resourcesPath + path.sep)
-+      const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith('/usr/lib/atom')
-       useSnapshot = !devMode && typeof snapshotResult !== 'undefined'
- 
-       if (devMode) {
-@@ -90,7 +90,7 @@
-   function setupWindow () {
-     const CompileCache = useSnapshot ? snapshotResult.customRequire('../src/compile-cache.js') : require('../src/compile-cache')
-     CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
--    CompileCache.install(process.resourcesPath, require)
-+    CompileCache.install('/usr/lib/atom', require)
- 
-     const ModuleCache = useSnapshot ? snapshotResult.customRequire('../src/module-cache.js') : require('../src/module-cache')
-     ModuleCache.register(getWindowLoadSettings())

Copied: atom/repos/community-x86_64/use-system-electron.patch (from rev 264978, atom/trunk/use-system-electron.patch)
===================================================================
--- community-x86_64/use-system-electron.patch	                        (rev 0)
+++ community-x86_64/use-system-electron.patch	2017-11-01 10:20:35 UTC (rev 264979)
@@ -0,0 +1,196 @@
+--- a/package.json
++++ b/package.json
+@@ -12,7 +12,6 @@
+     "url": "https://github.com/atom/atom/issues"
+   },
+   "license": "MIT",
+-  "electronVersion": "1.6.15",
+   "dependencies": {
+     "@atom/nsfw": "^1.0.18",
+     "@atom/source-map-support": "^0.3.4",
+--- a/script/build
++++ b/script/build
+@@ -2,10 +2,6 @@
+ 
+ 'use strict'
+ 
+-// Run bootstrap first to ensure all the dependencies used later in this script
+-// are installed.
+-require('./bootstrap')
+-
+ // Needed so we can require src/module-cache.coffee during generateModuleCache
+ require('coffee-script/register')
+ require('colors')
+@@ -26,7 +22,6 @@
+   .wrap(yargs.terminalWidth())
+   .argv
+ 
+-const checkChromedriverVersion = require('./lib/check-chromedriver-version')
+ const cleanOutputDirectory = require('./lib/clean-output-directory')
+ const codeSignOnMac = require('./lib/code-sign-on-mac')
+ const codeSignOnWindows = require('./lib/code-sign-on-windows')
+@@ -39,7 +34,6 @@
+ const generateAPIDocs = require('./lib/generate-api-docs')
+ const generateMetadata = require('./lib/generate-metadata')
+ const generateModuleCache = require('./lib/generate-module-cache')
+-const generateStartupSnapshot = require('./lib/generate-startup-snapshot')
+ const installApplication = require('./lib/install-application')
+ const packageApplication = require('./lib/package-application')
+ const prebuildLessCache = require('./lib/prebuild-less-cache')
+@@ -58,7 +52,6 @@
+ let binariesPromise = Promise.resolve()
+ 
+ if (!argv.existingBinaries) {
+-  checkChromedriverVersion()
+   cleanOutputDirectory()
+   copyAssets()
+   transpilePackagesWithCustomTranspilerPaths()
+@@ -72,63 +65,3 @@
+   generateAPIDocs()
+   binariesPromise = dumpSymbols()
+ }
+-
+-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)
+-        }
+-      }
+-      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) {
+-          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)
+-        }
+-
+-        if (argv.createRpmPackage) {
+-          createRpmPackage(packagedAppPath)
+-        } else {
+-          console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.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)
+-    }
+-  })
+--- a/script/package.json
++++ b/script/package.json
+@@ -8,9 +8,6 @@
+     "colors": "1.1.2",
+     "csslint": "1.0.2",
+     "donna": "1.0.16",
+-    "electron-chromedriver": "~1.6",
+-    "electron-link": "0.1.1",
+-    "electron-mksnapshot": "~1.6",
+     "electron-packager": "7.3.0",
+     "electron-winstaller": "2.6.3",
+     "fs-admin": "^0.1.5",
+--- a/src/compile-cache.js
++++ b/src/compile-cache.js
+@@ -121,7 +121,7 @@
+       return {
+         column,
+         line: row,
+-        source: path.join(resourcesPath, 'app', 'static', relativePath),
++        source: path.join(resourcesPath, 'static', relativePath),
+         name: null
+       }
+     }
+--- a/src/main-process/start.js
++++ b/src/main-process/start.js
+@@ -85,5 +85,5 @@
+ function setupCompileCache () {
+   const CompileCache = require('../compile-cache')
+   CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
+-  CompileCache.install(process.resourcesPath, require)
++  CompileCache.install('/usr/lib/atom', require)
+ }
+--- a/src/module-cache.coffee
++++ b/src/module-cache.coffee
+@@ -195,7 +195,7 @@
+   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)
+--- a/src/package-manager.js
++++ b/src/package-manager.js
+@@ -802,7 +802,7 @@
+   }
+ 
+   isBundledPackagePath (packagePath) {
+-    if (this.devMode && !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) {
++    if (this.devMode && this.resourcePath !== '/usr/lib/atom') {
+       return false
+     }
+ 
+--- a/src/task-bootstrap.js
++++ b/src/task-bootstrap.js
+@@ -3,7 +3,7 @@
+ 
+ const CompileCache = require('./compile-cache')
+ CompileCache.setCacheDirectory(compileCachePath)
+-CompileCache.install(`${process.resourcesPath}`, require)
++CompileCache.install('/usr/lib/atom', require)
+ 
+ const setupGlobals = function () {
+   global.attachEvent = function () {}
+--- a/static/index.js
++++ b/static/index.js
+@@ -23,7 +23,7 @@
+       process.resourcesPath = path.normalize(process.resourcesPath)
+ 
+       setupAtomHome()
+-      const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith(process.resourcesPath + path.sep)
++      const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith('/usr/lib/atom')
+       useSnapshot = !devMode && typeof snapshotResult !== 'undefined'
+ 
+       if (devMode) {
+@@ -90,7 +90,7 @@
+   function setupWindow () {
+     const CompileCache = useSnapshot ? snapshotResult.customRequire('../src/compile-cache.js') : require('../src/compile-cache')
+     CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
+-    CompileCache.install(process.resourcesPath, require)
++    CompileCache.install('/usr/lib/atom', require)
+ 
+     const ModuleCache = useSnapshot ? snapshotResult.customRequire('../src/module-cache.js') : require('../src/module-cache')
+     ModuleCache.register(getWindowLoadSettings())


More information about the arch-commits mailing list