From 30fb5ed04179c77302f481bf69fa0e8ef0c4b8fb Mon Sep 17 00:00:00 2001 From: rwinkhart Date: Thu, 30 Jun 2022 22:11:19 -0400 Subject: [PATCH] Updated compatibility with the upcoming sshyp-mfa extension Former-commit-id: 3d900bfcce18345a9595deca8951b3a91bdfa85b [formerly bf2298754489ea01f57af32ca4b765d6dbf90466] Former-commit-id: 34cbff97d0e671e71acd2baa95a0d129e1bafe79 --- bin/sshyp.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/sshyp.py b/bin/sshyp.py index 3d257ae..1c3bc2d 100755 --- a/bin/sshyp.py +++ b/bin/sshyp.py @@ -15,11 +15,11 @@ from textwrap import fill # utility functions -def entry_list_gen(): # generates and prints a list of all folders and entries +def entry_list_gen(_directory=path.expanduser('~/.local/share/sshyp/')): # generates and prints full entry list print('\n\u001b[38;5;0;48;5;15msshyp entries:\u001b[0m\n') _entry_list, _color_alternator = [], 1 - for _entry in sorted(listdir(directory)): - if Path(f"{directory}{_entry}").is_file(): + for _entry in sorted(listdir(_directory)): + if Path(f"{_directory}{_entry}").is_file(): if _color_alternator == 1: _entry_list.append(f"{_entry.replace('.gpg', '')}") _color_alternator = 2 @@ -35,12 +35,12 @@ def entry_list_gen(): # generates and prints a list of all folders and entries print(fill(' '.join(_entry_list), width=_width) + '\n') except ValueError: pass - for _root, _directories, _files in walk(directory): + for _root, _directories, _files in walk(_directory): for _dir in sorted(_directories): - _inner_dir = f"{_root.replace(directory, '')}/{_dir}" + _inner_dir = f"{_root.replace(_directory, '')}/{_dir}" print(f"\u001b[38;5;15;48;5;238m{_inner_dir}/\u001b[0m") _entry_list, _color_alternator = [], 1 - for _s_root, _s_directories, _s_files in walk(f"{directory[:-1]}{_inner_dir}"): + for _s_root, _s_directories, _s_files in walk(f"{_directory[:-1]}{_inner_dir}"): for _entry in sorted(_s_files): if _color_alternator == 1: _entry_list.append(f"{_entry.replace('.gpg', '')}")