Merge pull request #1753 from atom/cj-fixup-shell-script

Don't assume Atom is in /Applications when using the CLI

atom.sh

@@ -1,11 +1,15 @@
 #!/bin/sh
-ATOM_PATH=${ATOM_PATH-/Applications/Atom.app}
-ATOM_BINARY=$ATOM_PATH/Contents/MacOS/Atom
+ATOM_PATH=${ATOM_PATH:-/Applications} # Set ATOM_PATH unless it is already set
+ATOM_APP_NAME=Atom.app
 
-if [ ! -d $ATOM_PATH ]; then sleep 5; fi # Wait for Atom to reappear, Sparkle may be replacing it.
+# If ATOM_PATH isn't a executable file, use spotlight to search for Atom
+if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
+  ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | head -1 | xargs dirname)
+fi
 
-if [ ! -d $ATOM_PATH ]; then
-  echo "Atom application not found at '$ATOM_PATH'" >&2
+# Exit if Atom can't be found
+if [ -z "$ATOM_PATH" ]; then
+  echo "Cannot locate Atom.app, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing Atom.app."
   exit 1
 fi
 
@@ -31,18 +35,20 @@ while getopts ":wtfvhs-:" opt; do
 done
 
 if [ $EXPECT_OUTPUT ]; then
-  $ATOM_BINARY --executed-from="$(pwd)" --pid=$$ "$@"
+  "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/Atom" --executed-from="$(pwd)" --pid=$$ "$@"
   exit $?
 else
-  open -a $ATOM_PATH -n --args --executed-from="$(pwd)" --pid=$$ "$@"
+  echo "$ATOM_PATH/$ATOM_APP_NAME"
+  open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ "$@"
 fi
 
-# Used to exit process when atom is used as $EDITOR
+# Exits this process when Atom is used as $EDITOR
 on_die() {
   exit 0
 }
 trap 'on_die' SIGQUIT SIGTERM
 
+# If the wait flag is set, don't exit this process until Atom tells it to.
 if [ $WAIT ]; then
   while true; do
     sleep 1