electrum

commit 52315fdb72f5040118e9c338c5dcff655924870d
parent 95e27a0141b014fc9d79d488d69510adb4085433
Author: ThomasV <thomasv@electrum.org>
Date:   Mon,  7 Sep 2015 16:44:17 +0200

detect kivy from os.environ

Diffstat:
M
electrum
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/electrum b/electrum
@@ -36,6 +36,7 @@ script_dir = os.path.dirname(os.path.realpath(__file__))
 is_bundle = getattr(sys, 'frozen', False)
 is_local = not is_bundle and os.path.exists(os.path.join(script_dir, "setup-release.py"))
 is_android = 'ANDROID_DATA' in os.environ
+is_kivy = os.environ.get('PYTHONHOME','').find('kivy') != -1
 
 if is_local or is_android:
     sys.path.insert(0, os.path.join(script_dir, 'packages'))
@@ -463,7 +464,8 @@ if __name__ == '__main__':
     if is_android:
         config_options = {
             'verbose': True,
-            'gui': 'android',
+            'cmd': 'gui',
+            'gui': 'kivy' if is_kivy else 'android',
             'auto_connect': True,
         }
     else: