Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only write config in environment-to-ini if there are changes (#15861) #15868

Merged
merged 3 commits into from
May 15, 2021
Merged

Only write config in environment-to-ini if there are changes (#15861) #15868

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9685b2a
Only write config in environment-to-ini if there are changes (#15861)
zeripath May 13, 2021
888f37a
Merge branch 'release/v1.14' into backport-15861-v1.14
zeripath May 15, 2021
cd08057
Merge branch 'release/v1.14' into backport-15861-v1.14
zeripath May 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions contrib/environment-to-ini/environment-to-ini.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ func runEnvironmentToIni(c *cli.Context) error {
}
cfg.NameMapper = ini.SnackCase

changed := false

prefix := c.String("prefix") + "__"

for _, kv := range os.Environ() {
Expand Down Expand Up @@ -143,15 +145,21 @@ func runEnvironmentToIni(c *cli.Context) error {
continue
}
}
oldValue := key.Value()
if !changed && oldValue != value {
changed = true
}
key.SetValue(value)
}
destination := c.String("out")
if len(destination) == 0 {
destination = setting.CustomConf
}
err = cfg.SaveTo(destination)
if err != nil {
return err
if destination != setting.CustomConf || changed {
err = cfg.SaveTo(destination)
if err != nil {
return err
}
}
if c.Bool("clear") {
for _, kv := range os.Environ() {
Expand Down