github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Remove the --cleanDestinationDir flag", there is a better fix.

Browse source 
This reverts commit 768ec5df9f.
This commit is contained in:
Alexander Borsuk 2018-01-10 18:53:40 +03:00 committed by Bjørn Erik Pedersen
parent f0eecc6a4f
commit 1921a70ab1
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commands/hugo.go
View file

@ -237,6 +237,7 @@ func initRootPersistentFlags() {
// initHugoBuildCommonFlags initialize common flags related to the Hugo build. // initHugoBuildCommonFlags initialize common flags related to the Hugo build.
// Called by initHugoBuilderFlags. // Called by initHugoBuilderFlags.
func initHugoBuildCommonFlags(cmd *cobra.Command) { func initHugoBuildCommonFlags(cmd *cobra.Command) {
cmd.Flags().Bool("cleanDestinationDir", false, "remove files from destination not found in static directories")
cmd.Flags().BoolP("buildDrafts", "D", false, "include content marked as draft") cmd.Flags().BoolP("buildDrafts", "D", false, "include content marked as draft")
cmd.Flags().BoolP("buildFuture", "F", false, "include content with publishdate in the future") cmd.Flags().BoolP("buildFuture", "F", false, "include content with publishdate in the future")
cmd.Flags().BoolP("buildExpired", "E", false, "include expired content") cmd.Flags().BoolP("buildExpired", "E", false, "include expired content")
@ -483,6 +484,7 @@ func createLogger(cfg config.Provider) (*jww.Notepad, error) {
func (c *commandeer) initializeFlags(cmd *cobra.Command) { func (c *commandeer) initializeFlags(cmd *cobra.Command) {
persFlagKeys := []string{"debug", "verbose", "logFile"} persFlagKeys := []string{"debug", "verbose", "logFile"}
flagKeys := []string{ flagKeys := []string{
"cleanDestinationDir",
"buildDrafts", "buildDrafts",
"buildFuture", "buildFuture",
"buildExpired", "buildExpired",
@ -722,6 +724,9 @@ func (c *commandeer) copyStaticTo(dirs *src.Dirs, publishDir string) (uint64, er
syncer.NoChmod = c.Cfg.GetBool("noChmod") syncer.NoChmod = c.Cfg.GetBool("noChmod")
syncer.SrcFs = fs syncer.SrcFs = fs
syncer.DestFs = c.Fs.Destination syncer.DestFs = c.Fs.Destination
// Now that we are using a unionFs for the static directories
// We can effectively clean the publishDir on initial sync
syncer.Delete = c.Cfg.GetBool("cleanDestinationDir")
if syncer.Delete { if syncer.Delete {
c.Logger.INFO.Println("removing all files from destination that don't exist in static dirs") c.Logger.INFO.Println("removing all files from destination that don't exist in static dirs")

1
hugolib/config.go
View file

@ -164,6 +164,7 @@ func loadDefaultSettingsFor(v *viper.Viper) error {
return err return err
} }
v.SetDefault("cleanDestinationDir", false)
v.SetDefault("watch", false) v.SetDefault("watch", false)
v.SetDefault("metaDataFormat", "toml") v.SetDefault("metaDataFormat", "toml")
v.SetDefault("disable404", false) v.SetDefault("disable404", false)