Cloned2Preserve
/
jailmaker
mirror of https://github.com/Jip-Hop/jailmaker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use ls grep and awk in python

This commit is contained in:
Jip-Hop 2023-02-28 20:49:44 +01:00
parent 9406cebf6d
commit 5193085ad3
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jlmkr.py
View File

@ -647,11 +647,12 @@ def delete_jail(jail_name):
if check_jail_name_available(jail_name, False): if check_jail_name_available(jail_name, False):
eprint(f"A jail with name {jail_name} does not exist.") eprint(f"A jail with name {jail_name} does not exist.")
else: else:
check = input(f'CAUTION: Type "{jail_name}" to confirm jail deletion! \n') or "" check = input(f'\nCAUTION: Type "{jail_name}" to confirm jail deletion!\n\n') or ""
if check == jail_name: if check == jail_name:
jail_path = get_jail_path(jail_name) jail_path = get_jail_path(jail_name)
print(f"Trying to stop {jail_path} if it was running...") print(f"\nTrying to stop {jail_name} if it was running...")
subprocess.run(['machinectl', 'stop', jail_name]) subprocess.run(['machinectl', 'stop', jail_name])
# Need to sleep since deleting immediately after stop causes problems...
time.sleep(1) time.sleep(1)
print(f"Cleaning up: {jail_path}") print(f"Cleaning up: {jail_path}")
shutil.rmtree(jail_path) shutil.rmtree(jail_path)
@ -660,13 +661,19 @@ def delete_jail(jail_name):
def list_jails(): def list_jails():
""" """
List all running jails. List all available and running jails.
""" """
jail_path = os.path.join(JAILS_DIR_PATH)
eprint("\nAvailable containers:\n") jails = os.listdir(JAILS_DIR_PATH)
os.system(f"ls -l {jail_path} | grep '^d' | awk '{{print $NF}}'")
eprint("\nCurrently running containers:\n") print("Available jails:\n")
if not len(jails):
print("No jails.")
else:
for jail in jails:
print(f"{jail}")
print("\nCurrently running:\n")
os.system(f"machinectl list") os.system(f"machinectl list")
def main(): def main():