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

Move gpg variable declaration to happen before configuration (fixes gpg setup on Haiku)

Browse Source
This commit is contained in:
RandyTheSilly
2022-05-15 17:53:56 -04:00
parent 4258ad85ab
commit 88fd9e77a9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/sshyp
+4 -4
View File
@@ -578,6 +578,10 @@ if __name__ == "__main__":
for _argument in argument_list: for _argument in argument_list:
argument += _argument + ' ' argument += _argument + ' '
argument = argument[:-1] argument = argument[:-1]
if uname()[0] == 'Haiku': # set proper gpg command for OS
gpg = 'gpg --pinentry-mode loopback'
else:
gpg = 'gpg'
# import saved userdata # import saved userdata
if argument != 'tweak': if argument != 'tweak':
@@ -594,10 +598,6 @@ if __name__ == "__main__":
directory = str(ssh_info[3].replace('\n', '')) directory = str(ssh_info[3].replace('\n', ''))
directory_ssh = '/home/' + username_ssh + '/.password-pasture/' directory_ssh = '/home/' + username_ssh + '/.password-pasture/'
client_device_name = listdir(path.expanduser('~/.config/sshyp/devices'))[0] client_device_name = listdir(path.expanduser('~/.config/sshyp/devices'))[0]
if uname()[0] == 'Haiku':
gpg = 'gpg --pinentry-mode loopback'
else:
gpg = 'gpg'
except FileNotFoundError: except FileNotFoundError:
if device_type.lower() != 's': if device_type.lower() != 's':
print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!') print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')