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

diff --git a/commands/hugo.go b/commands/hugo.go
index ef3df9d71a5729efcab7a6e890f5345ff82bd64b..89e1094c3b99a142529d68d913e4480bf13775e3 100644 (file)
--- 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 3e41a14b42e05306b82f6c0db63b85819e4d87c3..ee4d38a185951bf4ed3e2086441ed908b33ee11f 100644 (file)
--- 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)
                }

diff --git a/helpers/path.go b/helpers/path.go
index ae33d2900bcee898c7c9413747e4043a9c3b8d88..757cedefb446821cd19662b59c294cfb5149fd4e 100644 (file)
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -130,7 +130,7 @@ func AbsPathify(inPath string) string {
                return filepath.Clean(inPath)
        }
 
-       // todo consider move workingDir to argument list
+       // TODO(bep): Consider moving workingDir to argument list
        return filepath.Clean(filepath.Join(viper.GetString("WorkingDir"), inPath))
 }