diff --git a/ssl_decrypt.py b/ssl_decrypt.py index 38e6935..e9fda31 100755 --- a/ssl_decrypt.py +++ b/ssl_decrypt.py @@ -8,8 +8,7 @@ from subprocess import check_call uname: Path = Path("/tmp/.log_user") -with open(uname, "r", encoding="utf-8") as f: - log_name = f.readline() +log_name = Path(uname).read_text(encoding="utf-8") # Folder Name "tlecdewg" = Tunnel Encrypt Decrypt Wireguard folder_path: Path = Path("/tmp/tlecdcwg/") @@ -31,5 +30,6 @@ if os.path.exists(f"{folder_path2}pbwgk.pem"): for detunnels in detl: tlname2 = f"{detunnels[:-4]}.conf" extpath = f"{folder_path}/{tlname2}" - check_call(["openssl", "pkeyutl", "-decrypt", "-inkey", PKEYFILE, "-in", detunnels, "-out", extpath]) + check_call(["openssl", "pkeyutl", "-decrypt", "-inkey", PKEYFILE, "-in", detunnels, + "-out", extpath]) shutil.chown(extpath, 1000, 1000) diff --git a/ssl_encrypt.py b/ssl_encrypt.py index d5a73c9..7ab4fa7 100755 --- a/ssl_encrypt.py +++ b/ssl_encrypt.py @@ -8,8 +8,7 @@ from subprocess import check_call uname: Path = Path("/tmp/.log_user") -with open(uname, "r", encoding="utf-8") as f: - log_name: str = f.readline() +log_name = Path(uname).read_text(encoding="utf-8") keyfile: Path = Path(f"/home/{log_name}/.config/wire_py/pbwgk.pem") folder_path: Path = Path("/tmp/tlecdcwg/") diff --git a/start_wg.py b/start_wg.py index 84999a1..decf670 100755 --- a/start_wg.py +++ b/start_wg.py @@ -7,12 +7,9 @@ from subprocess import check_call path_to_file = Path(Path.home() / ".config/wire_py/settings") -with open(path_to_file, "r", encoding="utf-8") as a_con: - - # This function is for the independent autostarted of the previously selected tunnel - lines = a_con.readlines() - a_con = lines[7].strip() - if a_con != "off": - check_call(["nmcli", "connection", "up", a_con]) - else: - pass +a_con = Path(path_to_file).read_text(encoding="utf-8").splitlines(keepends=True) +a_con = a_con[7].strip() +if a_con != "off": + check_call(["nmcli", "connection", "up", a_con]) +else: + pass