diff --git a/install.sh b/install.sh index cda8ef9..b146c1c 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash - +eval python3 preinstall eval "pip install -r requirements.txt" eval python3 installer diff --git a/installer b/installer index 56953c6..f6882b5 100755 --- a/installer +++ b/installer @@ -216,21 +216,6 @@ class SystemInstaller: messages = messages + ["Log file written to " + log_file.__str__()] -class RequiredPackages: - def __init__(self, bins): - self.required = bins - self.to_be_installed = [] - self.locate() - - def locate(self): - for bin in self.required: - if os.path.isfile(bin[1]): - continue - else: - self.to_be_installed.append(bin[0]) - return self.to_be_installed - - config = Configuration().open_file() sysinstall = SystemInstaller() installer = sysinstall.bin @@ -365,21 +350,6 @@ if RequiredServices().db_server_found(req) is False: psql_cmd, ] -""" -Check existance of required binaries. -Attempt to acquire them if non existant -""" -package_list = [["gcc", "/usr/bin/gcc"]] - -packages, required_packages = None, RequiredPackages(package_list) -for package in required_packages.to_be_installed: - packages = packages + package + " " -try: - breakpoint() - ret = sp.run(["sudo", "pacman", "-S", packages[0:-1]]) -except Exception as e: - ret = sp.run(["pacman", "-S", packages[0:-1]]) - # Post install configurations sysinstall.make_nginx_config(install_answers) try: diff --git a/preinstall b/preinstall index ff02d2c..fee8bdf 100755 --- a/preinstall +++ b/preinstall @@ -26,8 +26,8 @@ packages, required_packages = "", RequiredPackages(package_list) for package in required_packages.to_be_installed: packages = packages + package + " " try: - ret = run(["sudo", "pacman", "-S", packages[0:-1]], capture_output=True) + ret = run(["sudo", "pacman", "-S", packages[0:-1]]) print(ret) except Exception as e: - ret = run(["pacman", "-S", packages[0:-1]], capture_output=True) + ret = run(["pacman", "-S", packages[0:-1]]) print(ret)