From 676f58ae0d6d28ac7be3b288fc6f15f2b3aed640 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Fri, 4 Sep 2020 15:16:11 +0200
Subject: [PATCH] Remove ' based' in os

---
 install.py | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/install.py b/install.py
index ae391ba..37b25f3 100755
--- a/install.py
+++ b/install.py
@@ -51,29 +51,26 @@ class Installer:
                 ui.info_3("Found", operating_system)
 
                 if operating_system in ("arch", "manjaro"):
-                    subprocess.run(
-                        "sudo pacman -Syu",
-                        check=True,
-                        shell=True,
-                        stdout=this_stdout,
-                        stderr=this_stderr,
-                    )
-                    return "arch based"
+                    command = "sudo pacman -Syu"
+                    operating_system = "arch"
 
                 if operating_system in ("debian", "ubuntu"):
-                    subprocess.run(
-                        "sudo apt update",
-                        check=True,
-                        shell=True,
-                        stdout=this_stdout,
-                        stderr=this_stderr,
-                    )
-                    return "debian based"
+                    command = "sudo apt update"
+                    operating_system = "debian"
+
+                subprocess.run(
+                    command,
+                    check=True,
+                    shell=True,
+                    stdout=this_stdout,
+                    stderr=this_stderr,
+                )
+                return operating_system
 
         ui.warning("Operating system wasn't found")
         operating_system = input("What is it ? ")
         if operating_system in ("arch", "debian"):
-            return operating_system + " based"
+            return operating_system
 
         ui.fatal("I only support Arch and Debian based distros.")
 
@@ -83,8 +80,8 @@ class Installer:
         """Run a bash command. On success return True, else return False."""
 
         conditions = {
-            "arch": self.operating_system == "arch based",
-            "debian": self.operating_system == "debian based",
+            "arch": self.operating_system == "arch",
+            "debian": self.operating_system == "debian",
             "force": self.force,
             "no force": not self.force,
             "first install": self.first_install,
@@ -207,9 +204,9 @@ class Installer:
 
         ui.info_2("Installing packages...")
         for i, package in enumerate(packages):
-            if self.operating_system == "arch based":
+            if self.operating_system == "arch":
                 command = "sudo pacman -S --needed --noconfirm {}".format(package)
-            elif self.operating_system == "debian based":
+            elif self.operating_system == "debian":
                 command = "sudo apt install -y {}".format(package)
 
             ui.info_count(i, len(packages), package, end="... ")