From b957b46c08088624f62fb6e9b80281b77f7b9c28 Mon Sep 17 00:00:00 2001
From: Barry Allard <steakknife@users.noreply.github.com>
Date: Fri, 21 Oct 2016 00:34:34 -0700
Subject: [PATCH 1/2] atom.sh: fix for renamed .app

Needed because `node-gyp` doesn't work with a space in `Atom Beta.app`, and developers/others want to multiple versions of Atom side-by-side.
---
 atom.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/atom.sh b/atom.sh
index a8c30fa19..27d939273 100755
--- a/atom.sh
+++ b/atom.sh
@@ -55,11 +55,17 @@ if [ $EXPECT_OUTPUT ]; then
 fi
 
 if [ $OS == 'Mac' ]; then
+  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$(readlink "$0")")")")")"
+  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_APP_NAME="Atom Beta.app"
     ATOM_EXECUTABLE_NAME="Atom Beta"
   else
-    ATOM_APP_NAME="Atom.app"
     ATOM_EXECUTABLE_NAME="Atom"
   fi
 

From 25650e8de0b1ba3980322ba8a911c02621025357 Mon Sep 17 00:00:00 2001
From: Barry Allard <barry.allard@gmail.com>
Date: Mon, 24 Oct 2016 09:38:34 -0700
Subject: [PATCH 2/2] atom.sh: fix direct execute

---
 atom.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/atom.sh b/atom.sh
index 27d939273..47c902ce9 100755
--- a/atom.sh
+++ b/atom.sh
@@ -55,7 +55,12 @@ if [ $EXPECT_OUTPUT ]; then
 fi
 
 if [ $OS == 'Mac' ]; then
-  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$(readlink "$0")")")")")"
+  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