Fix download and home

apk2java.py

@@ -14,13 +14,13 @@
 sign_file=''
 home=os.path.dirname(os.path.realpath(sys.argv[0]))
 tmp='/tmp/apk2java/'
-external="https://github.com/TheZ3ro/apk2java-linux/archive/master.zip"
+external="https://github.com/TheZ3ro/apk2java-linux/releases/download/tool/tool.zip"
 
 def check_home(path):
   return os.path.isdir(path+"/tool")
 
 def getunzipped(theurl, thedir, report):
-  print "Downloading external tool..."
+  print "Downloading external tool... -> "+thedir+"/tool/" 
   name = os.path.join(thedir, 'temp.zip')
   try:
     name, hdrs = urllib.urlretrieve(theurl, name, report)
@@ -46,10 +46,11 @@ def getunzipped(theurl, thedir, report):
       fd.close()
   z.close()
   os.unlink(name)
+  print ""
 
 def report(blocknr, blocksize, size):
   current = blocknr*blocksize
-  sys.stdout.write("\rProgress: {0:.2f}%".format(100.0*current/size))
+  sys.stdout.write("\rProgress: {0:.2f}%".format(100.0*current/size)+" - {0:.1f} MB".format(current/1024/1024)+"/{0:.1f} MB".format(size/1024/1024))
 
 def apktool(smali):
   print "*********************************************"
@@ -131,11 +132,12 @@ def main():
     if check_home(home) == False:
       getunzipped(external, home, report)
   else:
-    if check_home(home) == False and check_home("/opt/apk2java") == False:
-      getunzipped(external, "/opt/apk2java", report)
-      home = "/opt/apk2java"
-
-  exit(0)
+    if check_home(home) == False:
+      if check_home("/opt/apk2java") == False:
+        getunzipped(external, "/opt/apk2java", report)
+        home = "/opt/apk2java"
+      else:
+        home = "/opt/apk2java"
 
   if (options.smali+options.jasmin+options.nosc) > 1:
     print "[ ERROR ] You can only select 1 source format --[smali/jasmin/java/no-source]"