From c6b74207bc35504cfa678d632d9d9c32f4feaf62 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Tue, 4 Nov 2014 18:58:45 -0800
Subject: [PATCH] config/init: init Version with CheckPeriod #265
---
cmd/ipfs/init.go | 5 +----
config/version.go | 12 +++++++++++-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go
index fc21f2bc1..18fbaa134 100644
--- a/cmd/ipfs/init.go
+++ b/cmd/ipfs/init.go
@@ -136,10 +136,7 @@ func initCmd(c *commander.Command, inp []string) error {
}
// tracking ipfs version used to generate the init folder and adding update checker default setting.
- cfg.Version = config.Version{
- Check: "error",
- Current: updates.Version,
- }
+ cfg.Version = config.VersionDefaultValue()
err = config.WriteConfigFile(filename, cfg)
if err != nil {
diff --git a/config/version.go b/config/version.go
index bbdcece3a..feb354b18 100644
--- a/config/version.go
+++ b/config/version.go
@@ -127,8 +127,18 @@ func RecordUpdateCheck(cfg *Config, filename string) {
if cfg.Version.CheckPeriod == "" {
// CheckPeriod was not initialized for some reason (e.g. config file broken)
- cfg.Version.CheckPeriod = strconv.Itoa(int(defaultCheckPeriod))
+ log.Error("config.Version.CheckPeriod not set. config broken?")
}
WriteConfigFile(filename, cfg)
}
+
+// VersionDefaultValue returns the default version config value (for init).
+func VersionDefaultValue() Version {
+ return Version{
+ Current: CurrentVersionNumber,
+ Check: "error",
+ CheckPeriod: strconv.Itoa(int(defaultCheckPeriod)),
+ AutoUpdate: AutoUpdateMinor,
+ }
+}