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 bab0d6a..a0e76fd 100755 --- a/installer +++ b/installer @@ -242,12 +242,6 @@ for key in install_answers: config["USER"] = "pyshelf" # Write configuration Configuration().write_file(config) -# Package List -breakpoint() -package_list = [["gcc", "/usr/bin/gcc"]] -packages, required_packages = "", RequiredPackages(package_list) -for package in required_packages: - packages = packages + package + " " # Start checking for our list of required services service_list = ["postgres", "nginx", "httpd"] req = RequiredServices().check_ps(service_list) diff --git a/preinstall b/preinstall new file mode 100755 index 0000000..ab3f178 --- /dev/null +++ b/preinstall @@ -0,0 +1,12 @@ +#!python +import os + +from installer import RequiredPackages + +# Package List +breakpoint() +package_list = [["gcc", "/usr/bin/gcc"]] +packages, required_packages = "", RequiredPackages(package_list) +for package in required_packages: + packages = packages + package + " " +os.system("sudo pacman -S %s" % packages)