From 8debbedb60bf0260e8f3c022ee28e7839130a657 Mon Sep 17 00:00:00 2001 From: Nik Ogura Date: Tue, 24 Jan 2023 10:54:00 -0800 Subject: [PATCH] add --yes to gpg commands, so if we rebuild and re-sign we're not prompted to confirm overwrite --- metadata.json | 2 +- pkg/gomason/gomason.go | 2 +- pkg/gomason/signing.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/metadata.json b/metadata.json index a08c2d2..e3c13c0 100644 --- a/metadata.json +++ b/metadata.json @@ -1,5 +1,5 @@ { - "version": "2.13.0", + "version": "2.13.1", "package": "github.com/nikogura/gomason", "description": "A tool for testing, building, signing, and publishing your project from a clean workspace.", "repository": "http://localhost:8081/artifactory/generic-local", diff --git a/pkg/gomason/gomason.go b/pkg/gomason/gomason.go index 4eb659e..9bf9520 100644 --- a/pkg/gomason/gomason.go +++ b/pkg/gomason/gomason.go @@ -19,7 +19,7 @@ func init() { } // VERSION is the current gomason version -const VERSION = "2.13.0" +const VERSION = "2.13.1" // METADATA_FILENAME The default gomason metadata file name const METADATA_FILENAME = "metadata.json" diff --git a/pkg/gomason/signing.go b/pkg/gomason/signing.go index fa30b62..c0df50e 100644 --- a/pkg/gomason/signing.go +++ b/pkg/gomason/signing.go @@ -96,12 +96,12 @@ func SignGPG(binary string, signingEntity string, meta Metadata) (err error) { if keyring, ok := meta.Options["keyring"]; ok { // use a custom keyring for testing - cmd = exec.Command(shellCmd, "--trustdb", meta.Options["trustdb"].(string), "--no-default-keyring", "--keyring", keyring.(string), "-bau", signingEntity, binary) + cmd = exec.Command(shellCmd, "--trustdb", meta.Options["trustdb"].(string), "--no-default-keyring", "--keyring", keyring.(string), "-bau", signingEntity, "--yes", binary) } else { // gpg -bau // -b detatch -a ascii armor -u specify user - cmd = exec.Command(shellCmd, "-bau", signingEntity, binary) + cmd = exec.Command(shellCmd, "-bau", signingEntity, "--yes", binary) } cmd.Stdout = os.Stdout