From e27e3f6f55d9ac8c1b0bac5cb4583e2f58d7f692 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 23 Jan 2015 12:24:05 +0530 Subject: [PATCH] Work around GPG boneheadedness --- setup/upload.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup/upload.py b/setup/upload.py index 7b40c599ed..70c4cf0438 100644 --- a/setup/upload.py +++ b/setup/upload.py @@ -252,9 +252,11 @@ class UploadToServer(Command): # {{{ description = 'Upload miscellaneous data to calibre server' def run(self, opts): + src_file = glob.glob('dist/calibre-*.tar.xz')[0] upload_signatures() - check_call('gpg --armor --detach-sign dist/calibre-*.tar.xz', shell=True) - check_call('scp dist/calibre-*.tar.xz.asc code:/srv/code/signatures/', shell=True) + gpg = os.path.expanduser('~/work/env/private/gpg') + check_call([gpg, '--armor', '--detach-sign', src_file]) + check_call(['scp', src_file + '.asc', 'code:/srv/code/signatures/']) check_call('ssh code /usr/local/bin/update-calibre-code.py'.split()) check_call(('ssh code /apps/update-calibre-version.py ' + __version__).split()) check_call('ssh main /usr/local/bin/update-calibre-code.py && /apps/static/generate.py'.split())