From 88fd9e77a95eef139e4158d36c23eaaf8ab79c12 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Sun, 15 May 2022 17:53:56 -0400 Subject: [PATCH] Move gpg variable declaration to happen before configuration (fixes gpg setup on Haiku) --- bin/sshyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/sshyp b/bin/sshyp index ad2ed36..42e801b 100755 --- a/bin/sshyp +++ b/bin/sshyp @@ -578,6 +578,10 @@ if __name__ == "__main__": for _argument in argument_list: argument += _argument + ' ' argument = argument[:-1] + if uname()[0] == 'Haiku': # set proper gpg command for OS + gpg = 'gpg --pinentry-mode loopback' + else: + gpg = 'gpg' # import saved userdata if argument != 'tweak': @@ -594,10 +598,6 @@ if __name__ == "__main__": directory = str(ssh_info[3].replace('\n', '')) directory_ssh = '/home/' + username_ssh + '/.password-pasture/' client_device_name = listdir(path.expanduser('~/.config/sshyp/devices'))[0] - if uname()[0] == 'Haiku': - gpg = 'gpg --pinentry-mode loopback' - else: - gpg = 'gpg' except FileNotFoundError: if device_type.lower() != 's': print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')