update to version 1.38

3 files changed, 9 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75068f688c13..f549c90c018c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = atom-editor-beta-bin
 	pkgdesc = Chrome-based text editor from Github - Beta Channel - Precompiled binary from official repository - PKGBUILD downloads the latest dev release when built.
-	pkgver = 1.29.0.beta2
-	pkgrel = 0
+	pkgver = 1.38.0.beta0
+	pkgrel = 1
 	url = https://github.com/atom/atom
 	install = atom-editor-beta-bin.install
 	arch = x86_64
@@ -20,11 +20,11 @@ pkgbase = atom-editor-beta-bin
 	optdepends = gvfs
 	conflicts = atom-editor-beta
 	options = !strip
-	source = atom-amd64-v1.29.0-beta2.deb::https://atom-installer.github.com/v1.29.0-beta2/atom-amd64.deb
+	source = atom-amd64-v1.38.0-beta0.deb::https://atom-installer.github.com/v1.38.0-beta0/atom-amd64.deb
 	source = atom-python.patch
 	source = startupwmclass.patch
 	md5sums = SKIP
-	md5sums = 501719c940fcd9c3d82fb8edebdaae09
+	md5sums = 677241ab040fa75db07f6a52d26930b9
 	md5sums = b05aef80afa76162ff9a1992cef3f0f9
 
 pkgname = atom-editor-beta-bin
diff --git a/PKGBUILD b/PKGBUILD
index 610c2e4f2534..6ddd30f707ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,14 @@
 # Upstream URL: https://github.com/atom/atom
 
 pkgname=atom-editor-beta-bin
-pkgver=1.29.0.beta2
+pkgver=1.38.0.beta0
 pkgver() {
   curl -sS https://github.com/atom/atom/releases.atom | grep -Eo 'v.*?beta([0-9]+)' | head -n 1 | sed -e 's/-/./' -e 's/v//'
 }
 get_version() {
    printf "%s" $(pkgver) | sed -e 's/\(.*\)\.beta/v\1-beta/'
 }
-pkgrel=0
+pkgrel=1
 pkgdesc="Chrome-based text editor from Github - Beta Channel - Precompiled binary from official repository - PKGBUILD downloads the latest dev release when built."
 arch=('x86_64')
 url="https://github.com/atom/atom"
@@ -28,7 +28,7 @@ conflicts=('atom-editor-beta')
 install=$pkgname.install
 
 md5sums=('SKIP'
-         '501719c940fcd9c3d82fb8edebdaae09'
+         '677241ab040fa75db07f6a52d26930b9'
          'b05aef80afa76162ff9a1992cef3f0f9')
 source=("atom-amd64-$(get_version).deb::https://atom-installer.github.com/$(get_version)/atom-amd64.deb"
          atom-python.patch
diff --git a/atom-python.patch b/atom-python.patch
index 7c07fdaa6e2a..fcac231080bd 100644
--- a/atom-python.patch
+++ b/atom-python.patch
@@ -1,41 +1,11 @@
---- a/usr/bin/atom-beta
-+++ b/usr/bin/atom-beta
-@@ -1,5 +1,12 @@
- #!/bin/bash
-
-+# Allow users to override command-line options
-+if [[ -f ~/.config/atom-editor-beta-flags.conf ]]; then
-+  ATOM_USER_FLAGS="$(cat ~/.config/atom-editor-beta-flags.conf)"
-+fi
-+
-+export PYTHON=python2
-+
- if [ "$(uname)" == 'Darwin' ]; then
-   OS='Mac'
- elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
-@@ -101,11 +108,11 @@
-   [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
-
-   if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ $ATOM_USER_FLAGS "$@"
-     exit $?
-   else
-     (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ $ATOM_USER_FLAGS "$@" > "$ATOM_HOME/nohup.out" 2>&1
-     if [ $? -ne 0 ]; then
-       cat "$ATOM_HOME/nohup.out"
-       exit $?
-
 --- a/usr/share/applications/atom-beta.desktop
 +++ b/usr/share/applications/atom-beta.desktop
 @@ -2,7 +2,7 @@
  Name=Atom Beta
  Comment=A hackable text editor for the 21st Century.
  GenericName=Text Editor
--Exec=/usr/share/atom-beta/atom %F
-+Exec=env PYTHON=python2 XMODIFIERS= /usr/share/atom-beta/atom %F
+-Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false /usr/bin/atom-beta %F
++Exec=env PYTHON=python2 /usr/bin/atom-beta %U
  Icon=atom-beta
  Type=Application
  StartupNotify=true