1
1
Fork 0
mirror of https://github.com/goreleaser/nfpm synced 2024-06-09 21:56:07 +02:00

Make Predefined a debian-specific modification

Based on feedback from @caarlos0.
This commit is contained in:
Jeremy Gill 2023-08-14 16:43:41 -04:00
parent 97a48c8275
commit f4676bfb73
2 changed files with 3 additions and 4 deletions

View File

@ -720,7 +720,7 @@ Replaces: {{join .}}
{{- with nonEmpty .Info.Provides}}
Provides: {{join .}}
{{- end }}
{{- with .Info.Predepends}}
{{- with .Info.Deb.Predepends}}
Pre-Depends: {{join .}}
{{- end }}
{{- with .Info.Depends}}

View File

@ -180,7 +180,6 @@ func (c *Config) expandEnvVars() {
c.Info.Arch = os.Expand(c.Info.Arch, c.envMappingFunc)
for or := range c.Overrides {
c.Overrides[or].Conflicts = c.expandEnvVarsStringSlice(c.Overrides[or].Conflicts)
c.Overrides[or].Predepends = c.expandEnvVarsStringSlice(c.Overrides[or].Predepends)
c.Overrides[or].Depends = c.expandEnvVarsStringSlice(c.Overrides[or].Depends)
c.Overrides[or].Replaces = c.expandEnvVarsStringSlice(c.Overrides[or].Replaces)
c.Overrides[or].Recommends = c.expandEnvVarsStringSlice(c.Overrides[or].Recommends)
@ -188,7 +187,6 @@ func (c *Config) expandEnvVars() {
c.Overrides[or].Suggests = c.expandEnvVarsStringSlice(c.Overrides[or].Suggests)
}
c.Info.Conflicts = c.expandEnvVarsStringSlice(c.Info.Conflicts)
c.Info.Predepends = c.expandEnvVarsStringSlice(c.Info.Predepends)
c.Info.Depends = c.expandEnvVarsStringSlice(c.Info.Depends)
c.Info.Replaces = c.expandEnvVarsStringSlice(c.Info.Replaces)
c.Info.Recommends = c.expandEnvVarsStringSlice(c.Info.Recommends)
@ -237,6 +235,7 @@ func (c *Config) expandEnvVars() {
for k, v := range c.Info.Deb.Fields {
c.Info.Deb.Fields[k] = os.Expand(v, c.envMappingFunc)
}
c.Info.Deb.Predepends = c.expandEnvVarsStringSlice(c.Info.Deb.Predepends)
}
// Info contains information about a single package.
@ -305,7 +304,6 @@ func (i *Info) parseSemver() {
type Overridables struct {
Replaces []string `yaml:"replaces,omitempty" json:"replaces,omitempty" jsonschema:"title=replaces directive,example=nfpm"`
Provides []string `yaml:"provides,omitempty" json:"provides,omitempty" jsonschema:"title=provides directive,example=nfpm"`
Predepends []string `yaml:"predepends,omitempty" json:"predepends,omitempty" jsonschema:"title=predepends directive,example=nfpm"`
Depends []string `yaml:"depends,omitempty" json:"depends,omitempty" jsonschema:"title=depends directive,example=nfpm"`
Recommends []string `yaml:"recommends,omitempty" json:"recommends,omitempty" jsonschema:"title=recommends directive,example=nfpm"`
Suggests []string `yaml:"suggests,omitempty" json:"suggests,omitempty" jsonschema:"title=suggests directive,example=nfpm"`
@ -393,6 +391,7 @@ type Deb struct {
Signature DebSignature `yaml:"signature,omitempty" json:"signature,omitempty" jsonschema:"title=signature"`
Compression string `yaml:"compression,omitempty" json:"compression,omitempty" jsonschema:"title=compression algorithm to be used,enum=gzip,enum=xz,enum=none,default=gzip"`
Fields map[string]string `yaml:"fields,omitempty" json:"fields,omitempty" jsonschema:"title=fields"`
Predepends []string `yaml:"predepends,omitempty" json:"predepends,omitempty" jsonschema:"title=predepends directive,example=nfpm"`
}
type DebSignature struct {