Add support for ~/.config/atom-editor-beta-flags.conf

4 files changed, 29 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9816d4fb4b8e..a3fc96becafa 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
 	pkgver = 1.3.0.beta6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/atom/atom
 	install = atom-editor-beta-bin.install
 	arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = atom-editor-beta-bin
 	source = atom-amd64-v1.3.0-beta6.deb::https://github.com/atom/atom/releases/download/v1.3.0-beta6/atom-amd64.deb
 	source = atom-python.patch
 	md5sums = 2d3fa47227ff7e4ee865c0fdf8c43d53
-	md5sums = 8ed449a6d7d7aff30d8208135a11d9dc
+	md5sums = bec6d0ab5edca667f726dd84540626aa
 
 pkgname = atom-editor-beta-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index b5d1987934de..238e44f42360 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=atom-editor-beta-bin
 _ver=1.3.0
 _beta=beta6
 pkgver="${_ver}.${_beta}"
-pkgrel=1
+pkgrel=2
 pkgdesc="Chrome-based text editor from Github - Beta Channel - Precompiled binary from official repository"
 arch=('x86_64')
 url="https://github.com/atom/atom"
@@ -22,7 +22,7 @@ conflicts=('atom-editor-beta')
 install=$pkgname.install
 
 md5sums=('2d3fa47227ff7e4ee865c0fdf8c43d53'
-         '8ed449a6d7d7aff30d8208135a11d9dc')
+         'bec6d0ab5edca667f726dd84540626aa')
 source=("atom-amd64-v${_ver}-${_beta}.deb::https://github.com/atom/atom/releases/download/v${_ver}-${_beta}/atom-amd64.deb"
          atom-python.patch)
 
diff --git a/atom-editor-beta-bin.install b/atom-editor-beta-bin.install
index 959a05111b50..8082b5661173 100644
--- a/atom-editor-beta-bin.install
+++ b/atom-editor-beta-bin.install
@@ -3,6 +3,10 @@ msg_blue() {
   printf "${blue}==>${bold} $1${all_off}\n"
 }
 
+note() {
+    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+
 _update() {
   msg_blue "Updating desktop MIME database..."
   update-desktop-database -q
@@ -10,6 +14,7 @@ _update() {
 
 post_install() {
   _update
+  note "Custom flags should be put directly in: ~/.config/atom-editor-beta-flags.conf"
 }
 
 post_upgrade() {
diff --git a/atom-python.patch b/atom-python.patch
index ba5f1bd41d29..02be9cc24fcb 100644
--- a/atom-python.patch
+++ b/atom-python.patch
@@ -1,15 +1,33 @@
 --- a/usr/bin/atom-beta
 +++ b/usr/bin/atom-beta
-@@ -1,5 +1,8 @@
+@@ -1,5 +1,13 @@
  #!/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
 +unset GTK_IM_MODULE QT_IM_MODULE XMODIFIERS
 +
  if [ "$(uname)" == 'Darwin' ]; then
    OS='Mac'
  elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
-
+@@ -99,11 +107,11 @@ elif [ $OS == 'Linux' ]; then
+   [ -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