diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/del.go | 6 | ||||
| -rw-r--r-- | cmd/dump.go | 6 | ||||
| -rw-r--r-- | cmd/root.go | 22 | ||||
| -rw-r--r-- | cmd/serve.go | 6 |
4 files changed, 28 insertions, 12 deletions
@@ -87,5 +87,9 @@ var delCmd = &cobra.Command{ func init() { rootCmd.AddCommand(delCmd) - delCmd.Flags().StringP("guestbook", "g", "my_guestbook", "Guestbook name (defined in /etc/guestbook.toml)") + if viper.IsSet("default_guestbook") { + defaultGuestbook = viper.GetString("default_guestbook") + } + + delCmd.Flags().StringP("guestbook", "g", defaultGuestbook, "Guestbook name (defined in /etc/guestbook.toml)") } diff --git a/cmd/dump.go b/cmd/dump.go index 769c4bc..3880c85 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -80,5 +80,9 @@ var dumpCmd = &cobra.Command{ func init() { rootCmd.AddCommand(dumpCmd) - dumpCmd.Flags().StringP("guestbook", "g", "my_guestbook", "Guestbook name (defined in /etc/guestbook.toml)") + if viper.IsSet("default_guestbook") { + defaultGuestbook = viper.GetString("default_guestbook") + } + + dumpCmd.Flags().StringP("guestbook", "g", defaultGuestbook, "Guestbook name (defined in /etc/guestbook.toml)") } diff --git a/cmd/root.go b/cmd/root.go index 0a7d0e6..b3b8395 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -27,11 +27,13 @@ import ( var rootCmd = &cobra.Command{ Use: "guestbook", - Version: "v1.6.2", + Version: "v1.7.0", Short: "Standalone guestbook server for static websites", Long: "Standalone guestbook server for static websites", } +var defaultGuestbook string = "my_guestbook" + func Execute() { err := rootCmd.Execute() if err != nil { @@ -40,12 +42,14 @@ func Execute() { } func init() { - cobra.OnInitialize(func () { - viper.SetConfigName("guestbook") - viper.AddConfigPath("/etc") - - if err := viper.ReadInConfig(); err != nil { - log.Fatal(err) - } - }) + viper.SetConfigName("guestbook") + viper.AddConfigPath("/etc") + + if err := viper.ReadInConfig(); err != nil { + log.Fatal(err) + } + + if viper.IsSet("default_guestbook") { + defaultGuestbook = viper.GetString("default_guestbook") + } } diff --git a/cmd/serve.go b/cmd/serve.go index 7d0b8c1..89f6680 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -130,5 +130,9 @@ var serveCmd = &cobra.Command{ func init() { rootCmd.AddCommand(serveCmd) - serveCmd.Flags().StringP("guestbook", "g", "my_guestbook", "Guestbook name (defined in /etc/guestbook.toml)") + if viper.IsSet("default_guestbook") { + defaultGuestbook = viper.GetString("default_guestbook") + } + + serveCmd.Flags().StringP("guestbook", "g", defaultGuestbook, "Guestbook name (defined in /etc/guestbook.toml)") } |