shithub: hugo

Info  •  Files  •  Log  •  Branches

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

--- a/commands/hugo.go

+++ b/commands/hugo.go

@@ -329,7 +329,8 @@

 	}

 	if Source != "" {

-		viper.Set("WorkingDir", Source)

+		dir, _ := filepath.Abs(Source)

+		viper.Set("WorkingDir", dir)

 	} else {

 		dir, _ := os.Getwd()

 		viper.Set("WorkingDir", dir)

--- a/commands/server.go

+++ b/commands/server.go

@@ -159,7 +159,7 @@

 	// 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)

 		}

--- a/helpers/path.go

+++ b/helpers/path.go

@@ -130,7 +130,7 @@

 		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))

 }