updates fro android

diff --git a/electrum b/electrum
index ce81f03..c245a2a 100755 (executable)
--- a/electrum
+++ b/electrum
@@ -34,8 +34,10 @@ except ImportError:
     sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
 
 
+is_android = 'ANDROID_DATA' in os.environ
+
 # load local module as electrum
-if os.path.exists("lib"):
+if os.path.exists("lib") or is_android:
     import imp
     fp, pathname, description = imp.find_module('lib')
     imp.load_module('electrum', fp, pathname, description)
@@ -89,7 +91,7 @@ if __name__ == '__main__':
     set_verbosity(options.verbose)
 
     # config is an object passed to the various constructors (wallet, interface, gui)
-    if 'ANDROID_DATA' in os.environ:
+    if is_android:
         config_options = {'wallet_path':"/sdcard/electrum.dat", 'portable':True, 'verbose':True, 'gui':'android'}
     else:
         config_options = eval(str(options))

diff --git a/make_packages b/make_packages
index f079ab4..936c48a 100755 (executable)
--- a/make_packages
+++ b/make_packages
@@ -20,10 +20,13 @@ if __name__ == '__main__':
     # android
     os.system('rm -rf dist/e4a-%s'%version)
     os.mkdir('dist/e4a-%s'%version)
-    shutil.copyfile("electrum",'dist/e4a-%s/electrum.py'%version)
+    shutil.copyfile("electrum",'dist/e4a-%s/e4a.py'%version)
     shutil.copytree("ecdsa",'dist/e4a-%s/ecdsa'%version)
     shutil.copytree("aes",'dist/e4a-%s/aes'%version)
-    shutil.copytree("lib",'dist/e4a-%s/electrum'%version)
+    shutil.copytree("lib",'dist/e4a-%s/lib'%version)
+    os.mkdir('dist/e4a-%s/gui'%version)
+    shutil.copy("gui/gui_android.py",'dist/e4a-%s/gui'%version)
+    shutil.copy("gui/__init__.py",'dist/e4a-%s/gui'%version)
 
     os.chdir("dist")
     # create the zip file