mirror of
https://github.com/th3r00t/pyShelf.git
synced 2026-04-28 01:59:35 -04:00
Moved preinstall procedures back out of installer
This commit is contained in:
2
install.sh
vendored
2
install.sh
vendored
@@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
eval python3 preinstall
|
||||||
eval "pip install -r requirements.txt"
|
eval "pip install -r requirements.txt"
|
||||||
eval python3 installer
|
eval python3 installer
|
||||||
|
|||||||
30
installer
vendored
30
installer
vendored
@@ -216,21 +216,6 @@ class SystemInstaller:
|
|||||||
messages = messages + ["Log file written to " + log_file.__str__()]
|
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()
|
config = Configuration().open_file()
|
||||||
sysinstall = SystemInstaller()
|
sysinstall = SystemInstaller()
|
||||||
installer = sysinstall.bin
|
installer = sysinstall.bin
|
||||||
@@ -365,21 +350,6 @@ if RequiredServices().db_server_found(req) is False:
|
|||||||
psql_cmd,
|
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
|
# Post install configurations
|
||||||
sysinstall.make_nginx_config(install_answers)
|
sysinstall.make_nginx_config(install_answers)
|
||||||
try:
|
try:
|
||||||
|
|||||||
4
preinstall
vendored
4
preinstall
vendored
@@ -26,8 +26,8 @@ packages, required_packages = "", RequiredPackages(package_list)
|
|||||||
for package in required_packages.to_be_installed:
|
for package in required_packages.to_be_installed:
|
||||||
packages = packages + package + " "
|
packages = packages + package + " "
|
||||||
try:
|
try:
|
||||||
ret = run(["sudo", "pacman", "-S", packages[0:-1]], capture_output=True)
|
ret = run(["sudo", "pacman", "-S", packages[0:-1]])
|
||||||
print(ret)
|
print(ret)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
ret = run(["pacman", "-S", packages[0:-1]], capture_output=True)
|
ret = run(["pacman", "-S", packages[0:-1]])
|
||||||
print(ret)
|
print(ret)
|
||||||
|
|||||||
Reference in New Issue
Block a user