From ea6d1be3558d7610ccc82b3a44dd30657a686639 Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Thu, 27 Jul 2017 13:18:54 -0400 Subject: [PATCH] Unbundle electron --- atom.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/atom.sh b/atom.sh index 6b0e94430..ea8e0dc2e 100755 --- a/atom.sh +++ b/atom.sh @@ -102,11 +102,10 @@ elif [ $OS == 'Linux' ]; then SCRIPT=$(readlink -f "$0") USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..) - if [ -n "$BETA_VERSION" ]; then - ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom" - else - ATOM_PATH="$USR_DIRECTORY/share/atom/atom" - fi + export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}" + export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}" + export LOCAL_GIT_DIRECTORY="{{ATOM_PREFIX}}/usr" + ATOM_PATH="{{ATOM_PATH}}" ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" mkdir -p "$ATOM_HOME" @@ -116,11 +115,11 @@ elif [ $OS == 'Linux' ]; then [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom" if [ $EXPECT_OUTPUT ]; then - "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" + "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" exit $? else ( - nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1 + nohup "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1 if [ $? -ne 0 ]; then cat "$ATOM_HOME/nohup.out" exit $? -- 2.13.3