[arch-commits] Commit in atom/trunk (4 files)

[Nicola Squartini]

    Date: Sunday, September 2, 2018 @ 12:49:29
  Author: tensor5
Revision: 376039

upgpkg: atom 1.30.0-1

Modified:
  atom/trunk/PKGBUILD
  atom/trunk/dugite-use-system-git.patch
  atom/trunk/fix-atom-sh.patch
  atom/trunk/use-system-electron.patch

-----------------------------+
 PKGBUILD                    |   10 +++++-----
 dugite-use-system-git.patch |   16 ++++++++--------
 fix-atom-sh.patch           |   32 ++++++++++++++++++++++++--------
 use-system-electron.patch   |    2 +-
 4 files changed, 38 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-02 12:40:58 UTC (rev 376038)
+++ PKGBUILD	2018-09-02 12:49:29 UTC (rev 376039)
@@ -2,7 +2,7 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=atom
-pkgver=1.29.0
+pkgver=1.30.0
 pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
@@ -23,15 +23,15 @@
         'symbols-view-use-system-ctags.patch'
         'use-system-apm.patch'
         'use-system-electron.patch')
-sha256sums=('0877984f5b68b14c1804647d505f4eb64a4353a69a9fd925e31d9cb89d50d178'
+sha256sums=('ebc4ef0922307f2c4dfd69c6cd2cb4f4c8f1dc7c00a55253437b7f893d2d94cd'
             'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
-            '866f19de9184287da459b0f9e8b79d0eeb72ba4e6c2a803ba29f74a33976deda'
-            '681f3d8e19b92548ca3a2929a13c84ef42af5a8e89bea79aba66dab30916caa6'
+            '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
+            'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2'
             'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205'
             'b9533bd31e9329d63abc5ec87b237761c73d0586485288925ba723fb34b3b933'
             '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
             '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b'
-            '3022ed1aad7eb0590a5b9477c742b513c5ac024985607ac4a90ddd66b63b1003')
+            '79ae5cf80af9a4aa4ff84cad3786e8cdf3eef25e967919c84374d490f9c7f884')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: dugite-use-system-git.patch
===================================================================
--- dugite-use-system-git.patch	2018-09-02 12:40:58 UTC (rev 376038)
+++ dugite-use-system-git.patch	2018-09-02 12:49:29 UTC (rev 376039)
@@ -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,16 +9,16 @@
      }
  }
  /**
-@@ -50,7 +50,7 @@
-     if (process.platform === 'darwin' ||
-         process.platform === 'linux' ||
-         process.platform === 'android') {
+@@ -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');
      }
-     else if (process.platform === 'win32') {
-         return path.join(gitDir, 'mingw64', 'libexec', 'git-core');
-@@ -100,9 +100,9 @@
+ }
+ /**
+@@ -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

Modified: fix-atom-sh.patch
===================================================================
--- fix-atom-sh.patch	2018-09-02 12:40:58 UTC (rev 376038)
+++ fix-atom-sh.patch	2018-09-02 12:49:29 UTC (rev 376039)
@@ -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,7 +30,7 @@
  export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
  
  while getopts ":wtfvh-:" opt; do
-@@ -62,82 +41,19 @@
+@@ -65,95 +41,19 @@
  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
  mkdir -p "$ATOM_HOME"
  
@@ -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"
 -      ;;
@@ -92,8 +109,7 @@
 -  esac
 -
 -  : ${TMPDIR:=/tmp}
-+ATOM_PATH="/usr/lib/atom/atom"
- 
+-
 -  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
 -
 -  if [ $EXPECT_OUTPUT ]; then

Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2018-09-02 12:40:58 UTC (rev 376038)
+++ use-system-electron.patch	2018-09-02 12:49:29 UTC (rev 376039)
@@ -133,7 +133,7 @@
  }
 --- 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",