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

When shearing, send "None" for shm instead of "0"

Browse Source 
Former-commit-id: 6882b4cf064dac1465bfe06bd5c837c149e0f5cd [formerly e30ce078d5]
Former-commit-id: bca35d2da074b16b8cdf39b0d3d609b95b9ef059
This commit is contained in:
RandyTheSilly
2023-02-25 15:28:30 -05:00
parent e22066f015
commit a91c48533c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sshyp.py
+2 -2
View File
@@ -154,7 +154,7 @@ def decrypt(_entry_dir, _shm_folder, _shm_entry, _quick_pass,
_unlock_method = ['gpg', '--pinentry-mode', 'loopback', '--passphrase', _quick_pass, '-qd', '--output']
else:
_unlock_method = ['gpg', '-qd', '--output']
if _shm_folder == 0 and _shm_entry == 0: # TODO set to 'None'
if _shm_folder is None and _shm_entry is None:
_output_target = ['/dev/null', expanduser('~/.config/sshyp/lock.gpg')]
else:
_output_target = [f"{_tmp_dir}{_shm_folder}/{_shm_entry}", f"{_entry_dir}.gpg"]
@@ -773,7 +773,7 @@ def remove_data(): # deletes an entry from the server and flags it for local de
_entry_name = entry_name_fetch('entry/folder to shear: ')
else:
_entry_name = entry_name_fetch()
determine_decrypt(expanduser('~/.config/sshyp/lock.gpg'), 0, 0)
determine_decrypt(expanduser('~/.config/sshyp/lock.gpg'), None, None)
if not ssh_error:
run(['ssh', '-i', expanduser('~/.ssh/sshyp'), '-p', port, f"{username_ssh}@{ip}",
f'cd /lib/sshyp; python3 -c \'from sshync import delete; delete("{_entry_name}", "remotely")\''])