vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-01 04:40:38 +00:00
Code Issues Projects Releases Wiki Activity

Allow GPGFinder to work with nonstandard GPG version strings

Browse Source 
Specifically, I have MacGPG installed instead of upstream GPG, which
results in the version string reading
  gpg (GnuPG/MacGPG2) 2.2.17

instead of the expected
  gpg (GnuPG) 2.2.17
This commit is contained in:
Don Kuntz
2019-10-16 16:43:00 -05:00
committed by Andrey Smirnov
parent 2da853dcbe
commit b7f74b4e55
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgp/gnupg_finder.go
+5 -5
View File
@@ -4,7 +4,6 @@ import (
"errors" "errors"
"os/exec" "os/exec"
"regexp" "regexp"
"strings"
) )
// GPGVersion stores discovered GPG version // GPGVersion stores discovered GPG version
@@ -52,7 +51,7 @@ func GPG1Finder() GPGFinder {
return &pathGPGFinder{ return &pathGPGFinder{
gpgNames: []string{"gpg", "gpg1"}, gpgNames: []string{"gpg", "gpg1"},
gpgvNames: []string{"gpgv", "gpgv1"}, gpgvNames: []string{"gpgv", "gpgv1"},
expectedVersionSubstring: "(GnuPG) 1.", expectedVersionSubstring: `\(GnuPG.*\) (1).(\d)`,
errorMessage: "Couldn't find a suitable gpg executable. Make sure gnupg1 is available as either gpg(v) or gpg(v)1 in $PATH", errorMessage: "Couldn't find a suitable gpg executable. Make sure gnupg1 is available as either gpg(v) or gpg(v)1 in $PATH",
} }
} }
@@ -62,7 +61,7 @@ func GPG2Finder() GPGFinder {
return &pathGPGFinder{ return &pathGPGFinder{
gpgNames: []string{"gpg", "gpg2"}, gpgNames: []string{"gpg", "gpg2"},
gpgvNames: []string{"gpgv", "gpgv2"}, gpgvNames: []string{"gpgv", "gpgv2"},
expectedVersionSubstring: "(GnuPG) 2.", expectedVersionSubstring: `\(GnuPG.*\) (2).(\d)`,
errorMessage: "Couldn't find a suitable gpg executable. Make sure gnupg2 is available as either gpg(v) or gpg(v)2 in $PATH", errorMessage: "Couldn't find a suitable gpg executable. Make sure gnupg2 is available as either gpg(v) or gpg(v)2 in $PATH",
} }
} }
@@ -134,10 +133,11 @@ func cliVersionCheck(cmd string, marker string) (result bool, version GPGVersion
} }
strOutput := string(output) strOutput := string(output)
result = strings.Contains(strOutput, marker) regex := regexp.MustCompile(marker)
version = GPG22xPlus version = GPG22xPlus
matches := gpgVersionRegex.FindStringSubmatch(strOutput) matches := regex.FindStringSubmatch(strOutput)
result = (matches != nil)
if matches != nil { if matches != nil {
if matches[1] == "1" { if matches[1] == "1" {
version = GPG1x version = GPG1x