From 8394f2e1b5d9e49c209480eddc6128fe56f21c4a Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 26 Jul 2015 16:07:49 -0400 Subject: [PATCH] =?UTF-8?q?Remove=20=E2=80=9C--batch=E2=80=9D=20from=20com?= =?UTF-8?q?mand=20used=20to=20detect=20encryption?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the “log-file” option is set in ~/.gnupg/gpg.conf, then using “--batch” means that the CLI's “--logger-fd” is ignored. Since this command shouldn't need any of “--batch”'s functionality and “log-file” hides all the output we're expecting, dropping “--batch” is the sane thing to do. Closes #40 Signed-off-by: James McCoy # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Your branch is up-to-date with 'origin/master'. # # Changes to be committed: # modified: plugin/gnupg.vim # # Untracked files: # foo.asc # foo.gpg # foo.sig # # ------------------------ >8 ------------------------ # Do not touch the line above. # Everything below will be removed. diff --git c/plugin/gnupg.vim i/plugin/gnupg.vim index 80f2061..b0bcd5c 100644 --- c/plugin/gnupg.vim +++ i/plugin/gnupg.vim @@ -1,5 +1,5 @@ " Name: gnupg.vim -" Last Change: 2015 Jul 16 +" Last Change: 2015 Jul 26 " Maintainer: James McCoy " Original Author: Markus Braun " Summary: Vim plugin for transparent editing of gpg encrypted files. @@ -448,7 +448,7 @@ function s:GPGDecrypt(bufread) " find the recipients of the file let cmd = { 'level': 3 } - let cmd.args = '--verbose --decrypt --list-only --dry-run --batch --no-use-agent --logger-fd 1 ' . shellescape(filename) + let cmd.args = '--verbose --decrypt --list-only --dry-run --no-use-agent --logger-fd 1 ' . shellescape(filename) let output = s:GPGSystem(cmd) " Suppress the "N more lines" message when editing a file, not when reading --- plugin/gnupg.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/gnupg.vim b/plugin/gnupg.vim index 80f2061..b0bcd5c 100644 --- a/plugin/gnupg.vim +++ b/plugin/gnupg.vim @@ -1,5 +1,5 @@ " Name: gnupg.vim -" Last Change: 2015 Jul 16 +" Last Change: 2015 Jul 26 " Maintainer: James McCoy " Original Author: Markus Braun " Summary: Vim plugin for transparent editing of gpg encrypted files. @@ -448,7 +448,7 @@ function s:GPGDecrypt(bufread) " find the recipients of the file let cmd = { 'level': 3 } - let cmd.args = '--verbose --decrypt --list-only --dry-run --batch --no-use-agent --logger-fd 1 ' . shellescape(filename) + let cmd.args = '--verbose --decrypt --list-only --dry-run --no-use-agent --logger-fd 1 ' . shellescape(filename) let output = s:GPGSystem(cmd) " Suppress the "N more lines" message when editing a file, not when reading