diff --git a/lib/sshyp.py b/lib/sshyp.py index 618893e..5dc6dd7 100755 --- a/lib/sshyp.py +++ b/lib/sshyp.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 -import os from os import chmod, environ, listdir, remove, uname, walk -from os.path import expanduser +from os.path import expanduser, isdir from pathlib import Path from random import randint from shutil import get_terminal_size, move, rmtree @@ -467,10 +466,10 @@ def no_arg(): # displays a list of entries and gives an option to select one fo if not Path(f"{directory}{_entry_name}.gpg").exists(): if not _entry_name: print(f"\n\u001b[38;5;9merror: missing entry name\u001b[0m\n") - elif os.path.isdir(f"{directory}{_entry_name}"): - print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) is a directory\u001b[0m\n") + elif isdir(f"{directory}{_entry_name}"): + print(f"\n\u001b[38;5;9merror: entry (/{_entry_name}) is a directory\u001b[0m\n") else: - print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) does not exist\u001b[0m\n") + print(f"\n\u001b[38;5;9merror: entry (/{_entry_name}) does not exist\u001b[0m\n") s_exit(2) _shm_folder, _shm_entry = shm_gen() determine_decrypt(directory + _entry_name, _shm_folder, _shm_entry) @@ -482,10 +481,10 @@ def read_shortcut(): # shortcut to quickly read an entry if not Path(f"{directory}{arguments[0].replace('/', '', 1)}.gpg").exists(): if not arguments[0].replace('/', '', 1): print(f"\n\u001b[38;5;9merror: missing entry name\u001b[0m\n") - elif os.path.isdir(f"{directory}{arguments[0].replace('/', '', 1)}"): - print(f"\n\u001b[38;5;9merror: entry ({arguments[0].replace('/', '', 1)}) is a directory\u001b[0m\n") + elif isdir(f"{directory}{arguments[0].replace('/', '', 1)}"): + print(f"\n\u001b[38;5;9merror: entry ({arguments[0]}) is a directory\u001b[0m\n") else: - print(f"\n\u001b[38;5;9merror: entry ({arguments[0].replace('/', '', 1)}) does not exist\u001b[0m\n") + print(f"\n\u001b[38;5;9merror: entry ({arguments[0]}) does not exist\u001b[0m\n") s_exit(2) _shm_folder, _shm_entry = shm_gen() determine_decrypt(directory + arguments[0].replace('/', '', 1), _shm_folder, _shm_entry)