Skip to content

Commit 9c9cb12

Browse files
committed
Use correct executable name for Atom Dev.app in atom.sh
1 parent 84b2ba7 commit 9c9cb12

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

atom.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,20 @@ if [ $OS == 'Mac' ]; then
7979
ATOM_APP_NAME="$(basename "$ATOM_APP")"
8080
fi
8181

82-
if [ "$CHANNEL" == 'beta' ]; then
83-
ATOM_EXECUTABLE_NAME="Atom Beta"
84-
elif [ "$CHANNEL" == 'nightly' ]; then
85-
ATOM_EXECUTABLE_NAME="Atom Nightly"
86-
elif [ "$CHANNEL" == 'dev' ]; then
87-
ATOM_EXECUTABLE_NAME="Atom Dev"
82+
if [ ! -z "${ATOM_APP_NAME}" ]; then
83+
# If ATOM_APP_NAME is known, use it as the executable name
84+
ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
8885
else
89-
ATOM_EXECUTABLE_NAME="Atom"
86+
# Else choose it from the inferred channel name
87+
if [ "$CHANNEL" == 'beta' ]; then
88+
ATOM_EXECUTABLE_NAME="Atom Beta"
89+
elif [ "$CHANNEL" == 'nightly' ]; then
90+
ATOM_EXECUTABLE_NAME="Atom Nightly"
91+
elif [ "$CHANNEL" == 'dev' ]; then
92+
ATOM_EXECUTABLE_NAME="Atom Dev"
93+
else
94+
ATOM_EXECUTABLE_NAME="Atom"
95+
fi
9096
fi
9197

9298
if [ -z "${ATOM_PATH}" ]; then

0 commit comments

Comments
 (0)