github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-29 23:12:10 -05:00
Code Issues Projects Releases Packages Wiki Activity

commands: Apply Golint rules to hugo.go

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2016-03-24 14:24:22 +01:00
parent 3bbfd99176
commit a7953e25bb
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
commands/hugo.go
View file

@ -46,6 +46,9 @@ import (
"gopkg.in/fsnotify.v1" "gopkg.in/fsnotify.v1"
) )
// MainSite represents the Hugo site to build. This variable is exported as it
// is used by at least one external library (the Hugo caddy plugin). We should
// provide a cleaner external API, but until then, this is it.
var MainSite *hugolib.Site var MainSite *hugolib.Site
// userError is an error used to signal different error situations in command handling. // userError is an error used to signal different error situations in command handling.
@ -260,7 +263,7 @@ func init() {
HugoCmd.PersistentFlags().SetAnnotation("logFile", cobra.BashCompFilenameExt, []string{}) HugoCmd.PersistentFlags().SetAnnotation("logFile", cobra.BashCompFilenameExt, []string{})
} }
func LoadDefaultSettings() { func loadDefaultSettings() {
viper.SetDefault("cleanDestinationDir", false) viper.SetDefault("cleanDestinationDir", false)
viper.SetDefault("Watch", false) viper.SetDefault("Watch", false)
viper.SetDefault("MetaDataFormat", "toml") viper.SetDefault("MetaDataFormat", "toml")
@ -323,14 +326,13 @@ func InitializeConfig(subCmdVs ...*cobra.Command) error {
if err != nil { if err != nil {
if _, ok := err.(viper.ConfigParseError); ok { if _, ok := err.(viper.ConfigParseError); ok {
return newSystemError(err) return newSystemError(err)
} else {
return newSystemErrorF("Unable to locate Config file. Perhaps you need to create a new site.\n Run `hugo help new` for details. (%s)\n", err)
} }
return newSystemErrorF("Unable to locate Config file. Perhaps you need to create a new site.\n Run `hugo help new` for details. (%s)\n", err)
} }
viper.RegisterAlias("indexes", "taxonomies") viper.RegisterAlias("indexes", "taxonomies")
LoadDefaultSettings() loadDefaultSettings()
for _, cmdV := range append([]*cobra.Command{hugoCmdV}, subCmdVs...) { for _, cmdV := range append([]*cobra.Command{hugoCmdV}, subCmdVs...) {