+2018-05-19 Jim Meyering <meyering@fb.com>
+
+ gnupload: adjust comment
+ * build-aux/gnupload: Add FIXME-2020 comment, to make it slightly
+ more likely we'll remove the just-added code in a year or two.
+
2018-05-19 Bruno Haible <bruno@clisp.org>
gnupload: Fix "gpg-agent is not available in this session" error.
#!/bin/sh
# Sign files and upload them.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2018-05-19.18; # UTC
# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# Choose the proper version of gpg, so as to avoid a
# "gpg-agent is not available in this session" error
# when gpg-agent is version 2 but gpg is still version 1.
-# This code can go away once all major distributions ship gpg version 2
-# as /usr/bin/gpg.
+# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg
gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'`
case "$gpg_agent_version" in
2.*)