[git] GnuPG - branch, master, updated. gnupg-2.1.9-144-g84ebf15

[by Neal H. Walfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  84ebf15b06e435453b2f58775f97a3a1c61a7e55 (commit)
      from  0b86c7463c8c057496b38e06c00f0ae4288dad49 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 84ebf15b06e435453b2f58775f97a3a1c61a7e55
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Nov 17 22:15:33 2015 +0100

    tools: Fix option parsing for gpg-zip.
    
    * tools/gpg-zip.in: Correctly set GPG when --gpg is specified.
    Correctly set TAR when --tar is specified.  Pass TAR_ARGS to tar.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Co-authored-by: Michael Mönch <michael.moench at marktjagd.de>
    GnuPG-bug-id 1351
    GnuPG-bug-id 1442

diff --git a/tools/gpg-zip.in b/tools/gpg-zip.in
index d27b1f9..a6b4238 100644
--- a/tools/gpg-zip.in
+++ b/tools/gpg-zip.in
@@ -94,7 +94,8 @@ while test $# -gt 0 ; do
       exit 0
       ;;
     --gpg)
-      GPG=$1
+      GPG=$2
+      shift
       shift
       ;;
     --gpg-args)
@@ -103,7 +104,8 @@ while test $# -gt 0 ; do
       shift
       ;;
     --tar)
-      TAR=$1
+      TAR=$2
+      shift
       shift
       ;;
     --tar-args)
@@ -126,8 +128,8 @@ while test $# -gt 0 ; do
 done
 
 if test x$create = xyes ; then
-#   echo "$TAR -cf - "$@" | $GPG --set-filename x.tar $gpg_args" 1>&2
-   $TAR -cf - "$@" | $GPG --set-filename x.tar $gpg_args
+#   echo "$TAR $tar_args -cf - "$@" | $GPG --set-filename x.tar $gpg_args" 1>&2
+   $TAR $tar_args -cf - "$@" | $GPG --set-filename x.tar $gpg_args
 elif test x$list = xyes ; then
 #   echo "cat \"$1\" | $GPG $gpg_args | $TAR $tar_args -tf -" 1>&2
    cat "$1" | $GPG $gpg_args | $TAR $tar_args -tf -

-----------------------------------------------------------------------

Summary of changes:
 tools/gpg-zip.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org