mirror of
https://github.com/goreleaser/nfpm
synced 2024-06-10 06:16:12 +02:00
fix(apk): conventional name template
closes #793 Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
This commit is contained in:
parent
f2711813ee
commit
d2f5585857
17
apk/apk.go
17
apk/apk.go
|
@ -94,8 +94,21 @@ func (a *Apk) ConventionalFileName(info *nfpm.Info) string {
|
||||||
version += "_" + info.Prerelease
|
version += "_" + info.Prerelease
|
||||||
}
|
}
|
||||||
|
|
||||||
if info.Release != "" {
|
if rel := info.Release; rel != "" {
|
||||||
version += "_p" + info.Release
|
if !strings.HasPrefix(rel, "r") {
|
||||||
|
rel = "r" + rel
|
||||||
|
}
|
||||||
|
version += "-" + rel
|
||||||
|
}
|
||||||
|
if meta := info.VersionMetadata; meta != "" {
|
||||||
|
if !strings.HasPrefix(meta, "p") &&
|
||||||
|
!strings.HasPrefix(meta, "cvs") &&
|
||||||
|
!strings.HasPrefix(meta, "svn") &&
|
||||||
|
!strings.HasPrefix(meta, "git") &&
|
||||||
|
!strings.HasPrefix(meta, "hg") {
|
||||||
|
meta = "p" + meta
|
||||||
|
}
|
||||||
|
version += "-" + meta
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Sprintf("%s_%s_%s.apk", info.Name, version, info.Arch)
|
return fmt.Sprintf("%s_%s_%s.apk", info.Name, version, info.Arch)
|
||||||
|
|
|
@ -477,12 +477,16 @@ func TestAPKConventionalFileName(t *testing.T) {
|
||||||
Expect: "default_1.2.3_x86_64.apk",
|
Expect: "default_1.2.3_x86_64.apk",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Arch: "386", Version: "1.2.3", Prerelease: "git",
|
Arch: "386", Version: "1.2.3", Meta: "git",
|
||||||
Expect: "default_1.2.3_git_x86.apk",
|
Expect: "default_1.2.3-git_x86.apk",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Arch: "386", Version: "1.2.3", Meta: "1", Release: "10",
|
||||||
|
Expect: "default_1.2.3-r10-p1_x86.apk",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Arch: "386", Version: "1.2.3", Prerelease: "git", Release: "1",
|
Arch: "386", Version: "1.2.3", Prerelease: "git", Release: "1",
|
||||||
Expect: "default_1.2.3_git_p1_x86.apk",
|
Expect: "default_1.2.3_git-r1_x86.apk",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Arch: "all", Version: "1.2.3",
|
Arch: "all", Version: "1.2.3",
|
||||||
|
@ -490,7 +494,11 @@ func TestAPKConventionalFileName(t *testing.T) {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Arch: "386", Version: "1.2.3", Release: "1", Prerelease: "beta1",
|
Arch: "386", Version: "1.2.3", Release: "1", Prerelease: "beta1",
|
||||||
Expect: "default_1.2.3_beta1_p1_x86.apk",
|
Expect: "default_1.2.3_beta1-r1_x86.apk",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Arch: "amd64", Version: "1.2.3a", Prerelease: "alpha1", Release: "47", Meta: "git-aaaccc",
|
||||||
|
Expect: "default_1.2.3a_alpha1-r47-git-aaaccc_x86_64.apk",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue