From 56e80566f9fe1fa741c8e7c9d1d7cd2f93eca53e Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Tue, 27 Jan 2015 13:50:02 +0100
Subject: [PATCH] simplify packages insertion

---
 electrum | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/electrum b/electrum
index c4931acc9..f30607bb0 100755
--- a/electrum
+++ b/electrum
@@ -26,23 +26,15 @@ import sys
 import time
 import traceback
 
-is_local = False
-is_android = False
-
-if sys.platform == 'darwin':
-    is_bundle = getattr(sys, 'frozen') == "macosx_app"
-    if is_bundle:
-        sys.path.insert(0, os.getcwd() + "/lib/python2.7/packages")
-else:
-    is_bundle = getattr(sys, 'frozen', False)
-    is_local = not is_bundle and os.path.dirname(os.path.realpath(__file__)) == os.getcwd()
-    is_android = 'ANDROID_DATA' in os.environ
-    if is_local:
-        sys.path.append('packages')
-
+is_bundle = getattr(sys, 'frozen', False)
 is_local = not is_bundle and os.path.dirname(os.path.realpath(__file__)) == os.getcwd()
 is_android = 'ANDROID_DATA' in os.environ
 
+if is_local:
+    sys.path.insert(0, 'packages')
+elif is_bundle and sys.platform=='darwin':
+    sys.path.insert(0, os.getcwd() + "/lib/python2.7/packages")
+
 import __builtin__
 __builtin__.use_local_modules = is_local or is_android