blob: 6d7106a9b316badba3d1949a6604dc4775ba7ac1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
--- 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
-
export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
while getopts ":wtfvh-:" opt; do
@@ -65,95 +41,19 @@
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
+ATOM_PATH="/usr/lib/atom/atom"
- 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
-
- if [ $EXPECT_OUTPUT ]; then
- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
- exit $?
- else
- open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
- 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
-
- : ${TMPDIR:=/tmp}
-
- [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
-
- if [ $EXPECT_OUTPUT ]; then
- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
+if [ $EXPECT_OUTPUT ]; then
+ "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
+ exit $?
+else
+ (
+ nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
+ if [ $? -ne 0 ]; then
+ cat "$ATOM_HOME/nohup.out"
exit $?
- 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
+ ) &
fi
# Exits this process when Atom is used as $EDITOR
|