diff --git a/cmd/root.go b/cmd/root.go index 2fd1a333c..73b9babfc 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -35,9 +35,9 @@ func NewRootCommand(stdin io.Reader, stdout, stderr io.Writer) *cobra.Command { This binary contains Pilosa itself, as well as common tools for administering Pilosa, importing/exporting data, backing up, and more. Complete documentation is available -at https://www.pilosa.com/docs/. +at https://docs.molecula.cloud/. -` + pilosa.VersionInfo() + "\n", +` + pilosa.VersionInfo(false) + "\n", PersistentPreRunE: func(cmd *cobra.Command, args []string) error { v := viper.New() err := setAllConfig(v, cmd.Flags()) diff --git a/server/server.go b/server/server.go index 11ff5bf1b..8593974d0 100644 --- a/server/server.go +++ b/server/server.go @@ -342,7 +342,7 @@ func (m *Command) SetupServer() error { return errors.Wrap(err, "setting up logger") } - m.logger.Infof("%s", pilosa.VersionInfo()) + m.logger.Infof("%s", pilosa.VersionInfo(m.Config.Future.Rename)) handleTrialDeadline(m.logger) diff --git a/version.go b/version.go index 9ad960f87..02e0da99c 100644 --- a/version.go +++ b/version.go @@ -26,7 +26,7 @@ var BuildTime string var GoVersion string = runtime.Version() var TrialDeadline string -func VersionInfo() string { +func VersionInfo(rename bool) string { var prefix string if Variant != "" { prefix = Variant + " " @@ -56,5 +56,9 @@ func VersionInfo() string { if TrialDeadline != "" { suffix += " limited time trial ends on: " + TrialDeadline } - return prefix + "FeatureBase" + suffix + productName := "Pilosa" + if rename { + productName = "FeatureBase" + } + return prefix + productName + suffix }