blob: 02be9cc24fcb3c2440394db02cb3aec22ff99bb4 (
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
|
--- a/usr/bin/atom-beta
+++ b/usr/bin/atom-beta
@@ -1,5 +1,13 @@
#!/bin/bash
+# Allow users to override command-line options
+if [[ -f ~/.config/atom-editor-beta-flags.conf ]]; then
+ ATOM_USER_FLAGS="$(cat ~/.config/atom-editor-beta-flags.conf)"
+fi
+
+export PYTHON=python2
+unset GTK_IM_MODULE QT_IM_MODULE XMODIFIERS
+
if [ "$(uname)" == 'Darwin' ]; then
OS='Mac'
elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
@@ -99,11 +107,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" --executed-from="$(pwd)" --pid=$$ $ATOM_USER_FLAGS "$@"
exit $?
else
(
- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
+ nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ $ATOM_USER_FLAGS "$@" > "$ATOM_HOME/nohup.out" 2>&1
if [ $? -ne 0 ]; then
cat "$ATOM_HOME/nohup.out"
exit $?
--- a/usr/share/applications/atom-beta.desktop
+++ b/usr/share/applications/atom-beta.desktop
@@ -2,7 +2,7 @@
Name=Atom Beta
Comment=A hackable text editor for the 21st Century.
GenericName=Text Editor
-Exec=/usr/share/atom-beta/atom %U
+Exec=env PYTHON=python2 GTK_IM_MODULE= QT_IM_MODULE= XMODIFIERS= /usr/share/atom-beta/atom %U
Icon=atom-beta
Type=Application
StartupNotify=true
--- a/usr/share/atom-beta/resources/app/apm/bin/apm
+++ b/usr/share/atom-beta/resources/app/apm/bin/apm
@@ -2,6 +2,8 @@
set -e
+export PYTHON=python2
+
initialCwd=`pwd -P`
apmPath=$0
|