--- a/atom.sh +++ b/atom.sh @@ -1,29 +1,5 @@ #!/bin/bash -if [ "$(uname)" == 'Darwin' ]; then - OS='Mac' -elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then - OS='Linux' -else - echo "Your platform ($(uname -a)) is not supported." - exit 1 -fi - -case $(basename $0) in - atom-beta) - CHANNEL=beta - ;; - atom-nightly) - CHANNEL=nightly - ;; - atom-dev) - CHANNEL=dev - ;; - *) - CHANNEL=stable - ;; -esac - # Only set the ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT env var if it hasn't been set. if [ -z "$ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT" ] then @@ -90,110 +66,24 @@ ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" mkdir -p "$ATOM_HOME" -if [ $OS == 'Mac' ]; then - 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 - ATOM_PATH="$(dirname "$ATOM_APP")" - ATOM_APP_NAME="$(basename "$ATOM_APP")" - fi - - 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 - # 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 - # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app - if [ -x "/Applications/$ATOM_APP_NAME" ]; then - ATOM_PATH="/Applications" - elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then - ATOM_PATH="$HOME/Applications" - else - # We haven't found an Atom.app, use spotlight to search for Atom - ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)" - - # Exit if Atom can't be found - if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then - echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}." - exit 1 - fi - fi - fi +ATOM_PATH="/usr/lib/atom/atom" - if [ $EXPECT_OUTPUT ]; then - "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@" - ATOM_EXIT=$? - if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then - exit "${EXIT_CODE_OVERRIDE}" - else - exit ${ATOM_EXIT} - fi +if [ $EXPECT_OUTPUT ]; then + "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" + ATOM_EXIT=$? + if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then + exit "${EXIT_CODE_OVERRIDE}" else - open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@" + exit ${ATOM_EXIT} fi -elif [ $OS == 'Linux' ]; then - SCRIPT=$(readlink -f "$0") - USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..) - - case $CHANNEL in - 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" - ;; - *) - ATOM_PATH="$USR_DIRECTORY/share/atom/atom" - ;; - esac - - #Will allow user to get context menu on cinnamon desktop enviroment - if [[ "$(expr substr $(printenv | grep "DESKTOP_SESSION=") 17 8)" == "cinnamon" ]]; then - cp "resources/linux/desktopenviroment/cinnamon/atom.nemo_action" "/usr/share/nemo/actions/atom.nemo_action" - fi - - : ${TMPDIR:=/tmp} - - [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom" - - if [ $EXPECT_OUTPUT ]; then - "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" - ATOM_EXIT=$? - if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then - exit "${EXIT_CODE_OVERRIDE}" - else - exit ${ATOM_EXIT} - fi - else - ( - nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1 - if [ $? -ne 0 ]; then - cat "$ATOM_HOME/nohup.out" - exit $? - fi - ) & +else + ( + nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1 + if [ $? -ne 0 ]; then + cat "$ATOM_HOME/nohup.out" + exit $? fi + ) & fi # Exits this process when Atom is used as $EDITOR