mirror/nfpm
1
1
Fork 0
mirror of https://github.com/goreleaser/nfpm synced 2025-04-30 14:18:01 +02:00
Code Issues Releases Activity

fix: simplified rpm version regex

Browse Source 
we should probably make it work on other langs as well.

refs https://gophers.slack.com/archives/C3T1JU24B/p1520790489000061
This commit is contained in:
Carlos Alexandro Becker 2018-03-12 10:27:42 -03:00
parent 5e04200641
commit 3db9ba1cd1
No known key found for this signature in database
GPG Key ID: E61E2F7DC14AB940
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm/rpm.go
View File

@ -90,7 +90,7 @@ func getRpmbuildVersion() (rpmbuildVersion, error) {
return parseRPMbuildVersion(strings.TrimSuffix(string(bts), "\n"))
}
var versionExp = regexp.MustCompile(`RPM[- ][Vv]ersion (\d+)\.(\d+)\.(\d+)`)
var versionExp = regexp.MustCompile(`RPM.* (\d+)\.(\d+)\.(\d+)`)
func parseRPMbuildVersion(out string) (rpmbuildVersion, error) {
matches := versionExp.FindAllStringSubmatch(out, -1)

4
rpm/rpm_test.go
View File

@ -121,6 +121,9 @@ func TestParseRpmbuildVersion(t *testing.T) {
for _, version := range []string{
"RPM-Version 4.14.1",
"RPM version 4.14.1",
"RPM vers~ao 4.14.1",
"RPM versão 4.14.1",
"RPM-Versionzz 4.14.1",
} {
t.Run(version, func(t *testing.T) {
v, err := parseRPMbuildVersion(version)
@ -134,7 +137,6 @@ func TestParseRpmbuildVersion(t *testing.T) {
func TestParseRpmbuildVersionError(t *testing.T) {
for _, version := range []string{
"RPM-Versionzz 4.14.1",
"nooo foo bar 1.2.3",
"RPM version 4.14.a",
"RPM version 4.14",