From bbf8ecf51d26147c6f31dbc3cb891487e67ffa60 Mon Sep 17 00:00:00 2001 From: Robin Daugherty Date: Sun, 19 Apr 2020 01:11:40 -0400 Subject: [PATCH 1/2] Fix order of arguments to ansible-vault --- bin/git-diff-ansible-vault | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git-diff-ansible-vault b/bin/git-diff-ansible-vault index 378154d..1a021da 100755 --- a/bin/git-diff-ansible-vault +++ b/bin/git-diff-ansible-vault @@ -176,7 +176,7 @@ delete_tmp_vault_password_file() { # decrypted_vault_contents() { - ansible-vault --vault-password-file="$VAULT_PASSWORD_FILE" view <( echo "$1" ) + ansible-vault view --vault-password-file="$VAULT_PASSWORD_FILE" <( echo "$1" ) test $? -eq 0 || warn "Unable to open vault: $FILE_PATH" } From 0860e917afba4f1b2ddb1cd84f4b5dfe35e07ec9 Mon Sep 17 00:00:00 2001 From: Robin Daugherty Date: Sun, 19 Apr 2020 01:25:44 -0400 Subject: [PATCH 2/2] Fix test for "ansible-vault view" --- bin/git-diff-ansible-vault | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git-diff-ansible-vault b/bin/git-diff-ansible-vault index 1a021da..2859de0 100755 --- a/bin/git-diff-ansible-vault +++ b/bin/git-diff-ansible-vault @@ -105,7 +105,7 @@ ensure_dependencies() { command -v ansible-vault > /dev/null test $? -eq 0 || abort 'Unable to find ansible-vault' - ansible-vault --help 2> /dev/null | grep ^Usage | grep -qE '\[.*view.*\]' + ansible-vault --help 2> /dev/null | grep -qE '\bview\b' test $? -eq 0 || abort 'Unable to find `ansible-vault view`. Ansible 1.8 or later required.' }