Merge pull request #667 from seberm/feature/add-gpg-command-into-config

Add possibility to configure GPG cli command in config file
twpayne · Apr 13, 2020 · f89a8c3 · f89a8c3
2 parents ecb873b + 2fca0ae
commit f89a8c3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/cmd/config.go b/cmd/config.go
@@ -139,6 +139,9 @@ func newConfig(options ...configOption) *Config {
 		Merge: mergeConfig{
 			Command: "vimdiff",
 		},
+		GPG: chezmoi.GPG{
+			Command: "gpg",
+		},
 		maxDiffDataSize:   1 * 1024 * 1024, // 1MB
 		templateFuncs:     sprig.TxtFuncMap(),
 		scriptStateBucket: []byte("script"),

diff --git a/cmd/docs.gen.go b/cmd/docs.gen.go
diff --git a/docs/REFERENCE.md b/docs/REFERENCE.md
@@ -183,6 +183,7 @@ The following configuration variables are available:
 | `follow`                | bool     | `false`                   | Follow symlinks                                     |
 | `genericSecret.command` | string   | *none*                    | Generic secret command                              |
 | `gopass.command`        | string   | `gopass`                  | gopass CLI command                                  |
+| `gpg.command`           | string   | `gpg`                     | GPG CLI command                                     |
 | `gpg.recipient`         | string   | *none*                    | GPG recipient                                       |
 | `gpg.symmetric`         | bool     | `false`                   | Use symmetric GPG encryption                        |
 | `keepassxc.args`        | []string | *none*                    | Extra args to KeePassXC CLI command                 |

diff --git a/internal/chezmoi/gpg.go b/internal/chezmoi/gpg.go
@@ -9,6 +9,7 @@ import (
 
 // GPG interfaces with gpg.
 type GPG struct {
+	Command   string
 	Recipient string
 	Symmetric bool
 }
@@ -28,8 +29,9 @@ func (g *GPG) Decrypt(filename string, ciphertext []byte) ([]byte, error) {
 		return nil, err
 	}
 
+	//nolint:gosec
 	cmd := exec.Command(
-		"gpg",
+		g.Command,
 		"--output", outputFilename,
 		"--quiet",
 		"--decrypt", inputFilename,
@@ -73,7 +75,9 @@ func (g *GPG) Encrypt(filename string, plaintext []byte) ([]byte, error) {
 		args = append(args, "--encrypt")
 	}
 	args = append(args, filename)
-	cmd := exec.Command("gpg", args...)
+
+	//nolint:gosec
+	cmd := exec.Command(g.Command, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr