diff options
author | Anthony Fok <foka@debian.org> | 2015-12-19 05:19:31 -0700 |
---|---|---|
committer | Anthony Fok <foka@debian.org> | 2015-12-19 05:19:31 -0700 |
commit | de82404d35bc0673ca4fe5c400945b3fc4e9aae2 (patch) | |
tree | b7947b5df25e3e10037230ccd9299edaac08d07c /commands | |
parent | a1d232f4b674dcdc7757ccc3bdae2f95f0733720 (diff) |
Fix hugo server "Watching for changes" path display
especially when the given `--source` path is a relative directory.
Also, when `--source` is specified, make WorkingDir an absolute path
from the very beginning, to be consistent with the case when `--source`
is not given. Otherwise, the function name helpers.AbsPathify(), which
prepends WorkingDir to a relative path, does not really make sense.
Fixes #1721
Diffstat (limited to 'commands')
-rw-r--r-- | commands/hugo.go | 3 | ||||
-rw-r--r-- | commands/server.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/commands/hugo.go b/commands/hugo.go index ef3df9d71..89e1094c3 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -329,7 +329,8 @@ func InitializeConfig(subCmdVs ...*cobra.Command) error { } if Source != "" { - viper.Set("WorkingDir", Source) + dir, _ := filepath.Abs(Source) + viper.Set("WorkingDir", dir) } else { dir, _ := os.Getwd() viper.Set("WorkingDir", dir) diff --git a/commands/server.go b/commands/server.go index 3e41a14b4..ee4d38a18 100644 --- a/commands/server.go +++ b/commands/server.go @@ -159,7 +159,7 @@ func server(cmd *cobra.Command, args []string) error { // Watch runs its own server as part of the routine if serverWatch { watchDirs := getDirList() - baseWatchDir := helpers.AbsPathify(viper.GetString("WorkingDir")) + baseWatchDir := viper.GetString("WorkingDir") for i, dir := range watchDirs { watchDirs[i], _ = helpers.GetRelativePath(dir, baseWatchDir) } |