flyingscorpio/setup-cockpit
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix subprocess output hidden, move define_os in class

Browse source
This commit is contained in:
flyingscorpio@arch-desktop 2020-09-04 15:08:07 +02:00
parent 7f4338a29b
commit fe481b0f0a
1 changed files with 48 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
install.py
View file

@ -29,12 +29,56 @@ class Installer:
self.conf = yaml.load(Path("configs.yml").text()) self.conf = yaml.load(Path("configs.yml").text())
self.base_dir = Path.getcwd() self.base_dir = Path.getcwd()
self.home = Path("~").expanduser() self.home = Path("~").expanduser()
self.operating_system = define_os() self.operating_system = self.define_os()
self.force = force self.force = force
self.first_install = first_install self.first_install = first_install
self.update = update self.update = update
self.hide_commands = hide_commands self.hide_commands = hide_commands
def define_os(self) -> str:
"""Define what OS we are using."""
os_release = Path("/etc/os-release")
oses = ("arch", "debian", "manjaro", "ubuntu")
# defaults for subprocess.run()
this_stdout: Optional[int] = subprocess.DEVNULL if self.hide_commands else None
this_stderr: Optional[int] = subprocess.DEVNULL if self.hide_commands else None
for operating_system in oses:
if operating_system in os_release.read_text().lower():
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"
if operating_system in ("debian", "ubuntu"):
subprocess.run(
"sudo apt update",
check=True,
shell=True,
stdout=this_stdout,
stderr=this_stderr,
)
return "debian based"
ui.warning("Operating system wasn't found")
operating_system = input("What is it ? ")
if operating_system in ("arch", "debian"):
return operating_system + " based"
ui.fatal("I only support Arch and Debian based distros.")
return "Unsupported OS"
def evaluate_condition(self, condition: str) -> bool: def evaluate_condition(self, condition: str) -> bool:
"""Run a bash command. On success return True, else return False.""" """Run a bash command. On success return True, else return False."""
@ -157,11 +201,9 @@ class Installer:
failed_installs = [] failed_installs = []
this_stdout: Optional[int] = None # defaults for subprocess.run()
this_stderr: Optional[int] = None this_stdout: Optional[int] = subprocess.DEVNULL if self.hide_commands else None
if self.hide_commands: this_stderr: Optional[int] = subprocess.DEVNULL if self.hide_commands else None
this_stdout = subprocess.DEVNULL
this_stderr = subprocess.DEVNULL
ui.info_2("Installing packages...") ui.info_2("Installing packages...")
for i, package in enumerate(packages): for i, package in enumerate(packages):
@ -337,45 +379,6 @@ class Installer:
ui.info() ui.info()
def define_os() -> str:
"""Define what OS we are using."""
os_release = Path("/etc/os-release")
oses = ("arch", "debian", "manjaro", "ubuntu")
for operating_system in oses:
if operating_system in os_release.read_text().lower():
ui.info_3("Found", operating_system)
if operating_system in ("arch", "manjaro"):
subprocess.run(
"sudo pacman -Syu",
check=True,
shell=True,
stdout=subprocess.DEVNULL,
)
return "arch based"
if operating_system in ("debian", "ubuntu"):
subprocess.run(
"sudo apt update",
check=True,
shell=True,
stdout=subprocess.DEVNULL,
)
return "debian based"
ui.warning("Operating system wasn't found")
operating_system = input("What is it ? ")
if operating_system in ("arch", "debian"):
return operating_system + " based"
ui.fatal("I only support Arch and Debian based distros.")
return "Unsupported OS"
def read_programs_from_process_list() -> List[str]: def read_programs_from_process_list() -> List[str]:
"""Read the process_list file to return a list of programs to process.""" """Read the process_list file to return a list of programs to process."""