One more error fix in the server command

And some other small code clean-up.

See #1502

diff --git a/commands/benchmark.go b/commands/benchmark.go
index 530bf3906ce56f8f1f78e473c729fc3dfe9bbf27..e83fa5506405f9770d80843daf4a77230c24bf55 100644 (file)
--- a/commands/benchmark.go
+++ b/commands/benchmark.go
@@ -23,7 +23,7 @@ var cpuProfilefile string
 var memProfilefile string
 var benchmarkTimes int
 
-var benchmark = &cobra.Command{
+var benchmarkCmd = &cobra.Command{
        Use:   "benchmark",
        Short: "Benchmark hugo by building a site a number of times.",
        Long: `Hugo can build a site many times over and analyze the running process
@@ -38,10 +38,10 @@ creating a benchmark.`,
 }
 
 func init() {
-       benchmark.Flags().StringVar(&cpuProfilefile, "cpuprofile", "", "path/filename for the CPU profile file")
-       benchmark.Flags().StringVar(&memProfilefile, "memprofile", "", "path/filename for the memory profile file")
+       benchmarkCmd.Flags().StringVar(&cpuProfilefile, "cpuprofile", "", "path/filename for the CPU profile file")
+       benchmarkCmd.Flags().StringVar(&memProfilefile, "memprofile", "", "path/filename for the memory profile file")
 
-       benchmark.Flags().IntVarP(&benchmarkTimes, "count", "n", 13, "number of times to build the site")
+       benchmarkCmd.Flags().IntVarP(&benchmarkTimes, "count", "n", 13, "number of times to build the site")
 }
 
 func bench(cmd *cobra.Command, args []string) error {

diff --git a/commands/check.go b/commands/check.go
index f176022460db7ffafcd22a4ea70fca5dd77bada4..59188dc9027fc111e7b96ceda6f6a583b5d9173b 100644 (file)
--- a/commands/check.go
+++ b/commands/check.go
@@ -18,7 +18,7 @@ import (
        "github.com/spf13/hugo/hugolib"
 )
 
-var check = &cobra.Command{
+var checkCmd = &cobra.Command{
        Use:   "check",
        Short: "Check content in the source directory",
        Long: `Hugo will perform some basic analysis on the content provided

diff --git a/commands/hugo.go b/commands/hugo.go
index 6724b794d97bb843d38f68afd3335e140a17ffcd..0cd9523488bfc6e383a81fe73b326df21c0b31b0 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -102,11 +102,11 @@ Complete documentation is available at http://gohugo.io/.`,
 
 var hugoCmdV *cobra.Command
 
-//Flags that are to be added to commands.
+// Flags that are to be added to commands.
 var BuildWatch, IgnoreCache, Draft, Future, UglyURLs, CanonifyURLs, Verbose, Logging, VerboseLog, DisableRSS, DisableSitemap, PluralizeListTitles, PreserveTaxonomyNames, NoTimes bool
 var Source, CacheDir, Destination, Theme, BaseURL, CfgFile, LogFile, Editor string
 
-//Execute adds all child commands to the root command HugoCmd and sets flags appropriately.
+// Execute adds all child commands to the root command HugoCmd and sets flags appropriately.
 func Execute() {
        HugoCmd.SetGlobalNormalizationFunc(helpers.NormalizeHugoFlags)
 
@@ -124,13 +124,13 @@ func Execute() {
        }
 }
 
-//AddCommands adds child commands to the root command HugoCmd.
+// AddCommands adds child commands to the root command HugoCmd.
 func AddCommands() {
        HugoCmd.AddCommand(serverCmd)
-       HugoCmd.AddCommand(version)
-       HugoCmd.AddCommand(config)
-       HugoCmd.AddCommand(check)
-       HugoCmd.AddCommand(benchmark)
+       HugoCmd.AddCommand(versionCmd)
+       HugoCmd.AddCommand(configCmd)
+       HugoCmd.AddCommand(checkCmd)
+       HugoCmd.AddCommand(benchmarkCmd)
        HugoCmd.AddCommand(convertCmd)
        HugoCmd.AddCommand(newCmd)
        HugoCmd.AddCommand(listCmd)
@@ -144,7 +144,7 @@ func AddCommands() {
 
 }
 
-//Initializes flags
+// init initializes flags.
 func init() {
        HugoCmd.PersistentFlags().BoolVarP(&Draft, "buildDrafts", "D", false, "include content marked as draft")
        HugoCmd.PersistentFlags().BoolVarP(&Future, "buildFuture", "F", false, "include content with publishdate in the future")
@@ -184,7 +184,7 @@ func init() {
        // This message will be shown to Windows users if Hugo is opened from explorer.exe
        cobra.MousetrapHelpText = `
 
-  Hugo is a command line tool
+  Hugo is a command-line tool
 
   You need to open cmd.exe and run it from there.`
 }
@@ -657,7 +657,8 @@ func NewWatcher(port int) error {
        return nil
 }
 
-// isThemeVsHugoVersionMismatch returns whether the current Hugo version is < theme's min_version
+// isThemeVsHugoVersionMismatch returns whether the current Hugo version is
+// less than the theme's min_version.
 func isThemeVsHugoVersionMismatch() (mismatch bool, requiredMinVersion string) {
        if !helpers.ThemeSet() {
                return

diff --git a/commands/limit_darwin.go b/commands/limit_darwin.go
index ab8dba0f7b3129c052ad429556b9a0205cc5c859..43371b898fef533a37d2724aea43264d3f97d9e6 100644 (file)
--- a/commands/limit_darwin.go
+++ b/commands/limit_darwin.go
@@ -22,14 +22,14 @@ import (
 )
 
 func init() {
-       check.AddCommand(limit)
+       checkCmd.AddCommand(limit)
 }
 
 var limit = &cobra.Command{
        Use:   "ulimit",
        Short: "Check system ulimit settings",
        Long: `Hugo will inspect the current ulimit settings on the system.
-    This is primarily to ensure that Hugo can watch enough files on some OSs`,
+This is primarily to ensure that Hugo can watch enough files on some OSs`,
        RunE: func(cmd *cobra.Command, args []string) error {
                var rLimit syscall.Rlimit
                err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)

diff --git a/commands/list_config.go b/commands/list_config.go
index d71d04a670c873549e08c5b6b5cc11f7841cab3b..57f8a56d50e9e0ee33df7587bfaead4fc78c5724 100644 (file)
--- a/commands/list_config.go
+++ b/commands/list_config.go
@@ -1,4 +1,4 @@
-// Copyright © 2013-15 Steve Francia <spf@spf13.com>.
+// Copyright © 2013-2015 Steve Francia <spf@spf13.com>.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import (
        "sort"
 )
 
-var config = &cobra.Command{
+var configCmd = &cobra.Command{
        Use:   "config",
        Short: "Print the site configuration",
        Long:  `Print the site configuration, both default and custom settings.`,

diff --git a/commands/new_test.go b/commands/new_test.go
index eb13833257690f36542c5b599f46ef311673f9a7..bffe9cc5ce887e99afe6e7ab700a30f8eae43142 100644 (file)
--- a/commands/new_test.go
+++ b/commands/new_test.go
@@ -4,9 +4,9 @@ import (
        "github.com/spf13/afero"
        "github.com/spf13/hugo/hugofs"
        "github.com/stretchr/testify/assert"
+       "os"
        "path/filepath"
        "testing"
-       "os"
 )
 
 // Issue #1133

diff --git a/commands/server.go b/commands/server.go
index 378637b6cc0a8aeb906d8fa9916b9db10a35e31d..ec6b5314974b0f26c5416d35c7be5cca660a75cf 100644 (file)
--- a/commands/server.go
+++ b/commands/server.go
@@ -1,4 +1,4 @@
-// Copyright © 2013-14 Steve Francia <spf@spf13.com>.
+// Copyright © 2013-2015 Steve Francia <spf@spf13.com>.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -94,7 +94,9 @@ func init() {
 }
 
 func server(cmd *cobra.Command, args []string) error {
-       InitializeConfig()
+       if err := InitializeConfig(); err != nil {
+               return err
+       }
 
        if cmd.Flags().Lookup("disableLiveReload").Changed {
                viper.Set("DisableLiveReload", disableLiveReload)

diff --git a/commands/version.go b/commands/version.go
index 56c134bc58ba606721c5d69589013bbc692d4af4..152ea1b7aba69efb19e4c2f2ed4a84a41b213584 100644 (file)
--- a/commands/version.go
+++ b/commands/version.go
@@ -28,7 +28,7 @@ import (
 
 var timeLayout string // the layout for time.Time
 
-var version = &cobra.Command{
+var versionCmd = &cobra.Command{
        Use:   "version",
        Short: "Print the version number of Hugo",
        Long:  `All software has versions. This is Hugo's.`,