From 1cb7db9503cd8423c511a52c97b54fa1fec4c9b4 Mon Sep 17 00:00:00 2001
From: hikariatama <elusloodus@mail.ru>
Date: Mon, 13 Mar 2023 08:34:43 +0000
Subject: [PATCH] Update dependencies installation process

---
 hikka/__main__.py | 75 +++++++++++++----------------------------------
 hikka/main.py     |  1 -
 2 files changed, 21 insertions(+), 55 deletions(-)

diff --git a/hikka/__main__.py b/hikka/__main__.py
index fc4e3b6..c8247f3 100755
--- a/hikka/__main__.py
+++ b/hikka/__main__.py
@@ -29,6 +29,24 @@ if (
         sys.exit(1)
 
 
+def deps():
+    subprocess.run(
+        [
+            sys.executable,
+            "-m",
+            "pip",
+            "install",
+            "--upgrade",
+            "-q",
+            "--disable-pip-version-check",
+            "--no-warn-script-location",
+            "-r",
+            "requirements.txt",
+        ],
+        check=True,
+    )
+
+
 if sys.version_info < (3, 8, 0):
     print("🚫 Error: you must use at least Python version 3.8.0")
 elif __package__ != "hikka":  # In case they did python __main__.py
@@ -44,49 +62,14 @@ else:
 
             if tuple(map(int, hikkatl.__version__.split("."))) < (2, 0, 2):
                 raise ImportError
-        except ImportError:
-            print("🔄 Installing Hikka-TL...")
 
-            subprocess.run(
-                [
-                    sys.executable,
-                    "-m",
-                    "pip",
-                    "install",
-                    "--force-reinstall",
-                    "-q",
-                    "--disable-pip-version-check",
-                    "--no-warn-script-location",
-                    "hikka-tl-new",
-                ],
-                check=True,
-            )
-
-            restart()
-
-        try:
             import hikkapyro
 
             if tuple(map(int, hikkapyro.__version__.split("."))) < (2, 0, 102):
                 raise ImportError
         except ImportError:
-            print("🔄 Installing Hikka-Pyro...")
-
-            subprocess.run(
-                [
-                    sys.executable,
-                    "-m",
-                    "pip",
-                    "install",
-                    "--force-reinstall",
-                    "-q",
-                    "--disable-pip-version-check",
-                    "--no-warn-script-location",
-                    "hikka-pyro-new",
-                ],
-                check=True,
-            )
-
+            print("🔄 Installing dependencies...")
+            deps()
             restart()
 
     try:
@@ -97,23 +80,7 @@ else:
         from . import main
     except ImportError as e:
         print(f"{str(e)}\n🔄 Attempting dependencies installation... Just wait ⏱")
-
-        subprocess.run(
-            [
-                sys.executable,
-                "-m",
-                "pip",
-                "install",
-                "--upgrade",
-                "-q",
-                "--disable-pip-version-check",
-                "--no-warn-script-location",
-                "-r",
-                "requirements.txt",
-            ],
-            check=True,
-        )
-
+        deps()
         restart()
 
     if "HIKKA_DO_NOT_RESTART" in os.environ:
diff --git a/hikka/main.py b/hikka/main.py
index 674c2da..dc25ebd 100755
--- a/hikka/main.py
+++ b/hikka/main.py
@@ -137,7 +137,6 @@ def generate_app_name() -> str:
     :return: Random app name
     :example: "Cresco Cibus Consilium"
     """
-    random.seed(0)
     return " ".join(random.choices(LATIN_MOCK, k=3))