GitHubMirror/sshyp
1
0
Fork 0
mirror of https://github.com/rwinkhart/sshyp.git synced 2026-08-28 04:46:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect and unfinished arguments throwing an exception (they now show the help screen)

Browse Source 
Former-commit-id: 66269ca39397ade2d8b27f75b18aa5ddd48f5b32 [formerly 71cd1f7824]
Former-commit-id: d8aa34d767f05063265550db0d6bee73a11833ac
This commit is contained in:
RandyTheSilly
2023-02-23 23:47:50 -05:00
parent 39dbc1c83d
commit 6bbb84e1c0
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sshyp.py
+8 -10
View File
@@ -832,7 +832,7 @@ if __name__ == "__main__":
tweak()
# run function based on arguments
if arg_count > 1:
if (arg_count == 2 and arg_start == 0) or (arg_count == 3 and arg_start == 1):
if arguments[arg_start] == 'copy':
if arguments[arg_start_p] == 'username' or arguments[arg_start_p] == '-u' or arguments[arg_start_p] == \
'password' or arguments[arg_start_p] == '-p' or arguments[arg_start_p] == 'url' or arguments[
@@ -862,12 +862,10 @@ if __name__ == "__main__":
'-n':
success_flag, sync_flag = True, True
edit()
elif arguments[arg_start] == 'gen':
elif arguments[arg_start] == 'gen' and (arguments[arg_start_p] == 'update' or
arguments[arg_start_p] == '-u'):
success_flag, sync_flag = True, True
gen()
elif arguments[arg_start] == 'shear':
success_flag, sync_flag = True, True
remove_data()
elif device_type == 'server' and arguments[arg_start] == 'whitelist':
if arguments[arg_start_p] == 'list' or arguments[arg_start_p] == '-l':
success_flag = True
@@ -880,14 +878,14 @@ if __name__ == "__main__":
success_flag = True
whitelist_setup()
elif arg_count > 0:
if arg_start == 1:
elif arg_count == 1 or (arg_count == 2 and arg_start == 1):
if arg_count == 1 and arg_start == 1:
success_flag = True
read_shortcut()
elif arguments[0] == 'gen':
elif arguments[arg_start] == 'gen':
success_flag, sync_flag = True, True
gen()
elif arguments[0] == 'shear':
elif arguments[arg_start]:
success_flag, sync_flag = True, True
remove_data()
@@ -896,5 +894,5 @@ if __name__ == "__main__":
elif (not ssh_error and sync_flag) or arguments[0] == 'sync':
sync()
except KeyboardInterrupt: # TODO handle exception for unfinished args, such as "sshyp /test/test edit"
except KeyboardInterrupt:
print('\n')