From 259e67aad9b7e74fe82658f81eedc1afe3216812 Mon Sep 17 00:00:00 2001
From: Dima YaFlay <93622229+YaFlay@users.noreply.github.com>
Date: Mon, 3 Jan 2022 01:38:02 +0300
Subject: [PATCH] 1.0.1

Fixing bugs
---
 installer.py | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/installer.py b/installer.py
index fbb27b3..6f7e47e 100644
--- a/installer.py
+++ b/installer.py
@@ -8,10 +8,10 @@ from commands import internet_button
 
 def java_download():
      if internet_button():
-          if architecture() == '32bit':
-                    java='https://bit.ly/java32python'
+          if '32bit' in architecture():
+                    java='https://javadl.oracle.com/webapps/download/AutoDL?BundleId=245477_4d5417147a92418ea8b615e228bb6935&utm_source=Java'
                     urlretrieve(java, 'C:/minecraft/jre-8u311-windows-i586-iftw.exe')
-                    print('Core downloaded')
+                    print('Java installer downloaded')
                     print('Openning...')
                     chdir('C:/minecraft/')
                     startfile(r'C:/minecraft/jre-8u311-windows-i586-iftw.exe')
@@ -21,17 +21,16 @@ def java_download():
                               if name == 'jre-8u311-windows-i586-iftw.exe':
                                    return True
                     while process_name_32():
-                         sleep(5)
+                         sleep(1)
                     print('Java downloaded')
                     if path.isfile('C:/minecraft/jre-8u311-windows-i586-iftw.exe'):
                          remove('jre-8u311-windows-i586-iftw.exe')
                          print('Java installer deleted')
-                    pass
-                    messagebox.showinfo('Java_32', 'Java has been downloaded! Press ok for leave')
-          elif architecture() == '64bit':
-               java_64='https://bit.ly/java64python'
+                    messagebox.showinfo('Java', 'Java has been downloaded! Press ok for leave')
+          elif '64bit' in architecture():
+               java_64='https://javadl.oracle.com/webapps/download/AutoDL?BundleId=245479_4d5417147a92418ea8b615e228bb6935'
                urlretrieve(java_64, 'C:/minecraft/jre-8u311-windows-x64.exe')
-               print('Core downloaded')
+               print('Java installer downloaded')
                print('Openning...')
                chdir('C:/minecraft/')
                startfile(r'C:/minecraft/jre-8u311-windows-x64.exe')
@@ -41,33 +40,32 @@ def java_download():
                          if name == 'jre-8u311-windows-x64.exe':
                               return True
                while process_name_64():
-                    sleep(5)
+                    sleep(1)
                print('Java downloaded')
                if path.isfile('C:/minecraft/jre-8u311-windows-x64.exe'):
                     remove('jre-8u311-windows-x64.exe')
                     print('Java installer deleted')
-               pass
-          pass 
-          messagebox.showinfo('Java_64','Java has been downloaded! Press ok for leave')
+               messagebox.showinfo('Java','Java has been downloaded! Press ok for leave')
+          
      else:
           messagebox.showerror(title='Internet', message='Internet don`t connected')
 
 def python_install():
      if internet_button():
           url = 'https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe'
-          urlretrieve(url, 'C:/minecraft/python-3.10.0-amd64.exe')
-          print('Python downloaded')
+          if not path.isfile('C:/minecraft/python-3.10.0-amd64.exe'):urlretrieve(url, 'C:/minecraft/python-3.10.0-amd64.exe')
+          print('Python installer downloaded')
           print('Openning....')
           chdir('C:/minecraft/')
-          startfile(r'C:/minecraft/python-3.10.0-amd64.exe')
-          def process_name_64():
+          startfile('C:/minecraft/python-3.10.0-amd64.exe')
+          def process_name():
                     for proce in process_iter():
                          name = proce.name()
                          if name == 'python-3.10.0-amd64.exe':
                               return True
-                    while process_name_64():
-                         sleep(5)
-                    print('Python downloaded')
+          while process_name():
+               sleep(1)
+          print('Python downloaded')
           remove('python-3.10.0-amd64.exe')
           print('Python installer removed')
           messagebox.showinfo('Python','Python has been downloaded! Press ok for leave')