phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add flag --cleanDestinationDir=false to retain prior behavior

Browse source
This commit is contained in:
Steve Francia 2016-01-29 16:14:23 -05:00
parent 5def6d9aee
commit c438f45629
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
commands/hugo.go
View file

@ -115,7 +115,7 @@ Complete documentation is available at http://gohugo.io/.`,
var hugoCmdV *cobra.Command var hugoCmdV *cobra.Command
// Flags that are to be added to commands. // Flags that are to be added to commands.
var BuildWatch, IgnoreCache, Draft, Future, UglyURLs, CanonifyURLs, Verbose, Logging, VerboseLog, DisableRSS, DisableSitemap, DisableRobotsTXT, PluralizeListTitles, PreserveTaxonomyNames, NoTimes, ForceSync bool var BuildWatch, IgnoreCache, Draft, Future, UglyURLs, CanonifyURLs, Verbose, Logging, VerboseLog, DisableRSS, DisableSitemap, DisableRobotsTXT, PluralizeListTitles, PreserveTaxonomyNames, NoTimes, ForceSync, CleanDestination bool
var Source, CacheDir, Destination, Theme, BaseURL, CfgFile, LogFile, Editor string var Source, CacheDir, Destination, Theme, BaseURL, CfgFile, LogFile, Editor string
// Execute adds all child commands to the root command HugoCmd and sets flags appropriately. // Execute adds all child commands to the root command HugoCmd and sets flags appropriately.
@ -158,6 +158,7 @@ func AddCommands() {
// initCoreCommonFlags initializes common flags used by Hugo core commands // initCoreCommonFlags initializes common flags used by Hugo core commands
// such as hugo itself, server, check, config and benchmark. // such as hugo itself, server, check, config and benchmark.
func initCoreCommonFlags(cmd *cobra.Command) { func initCoreCommonFlags(cmd *cobra.Command) {
cmd.Flags().BoolVar(&CleanDestination, "cleanDestinationDir", false, "Remove files from destination not found in static directories")
cmd.Flags().BoolVarP(&Draft, "buildDrafts", "D", false, "include content marked as draft") cmd.Flags().BoolVarP(&Draft, "buildDrafts", "D", false, "include content marked as draft")
cmd.Flags().BoolVarP(&Future, "buildFuture", "F", false, "include content with publishdate in the future") cmd.Flags().BoolVarP(&Future, "buildFuture", "F", false, "include content with publishdate in the future")
cmd.Flags().BoolVar(&DisableRSS, "disableRSS", false, "Do not build RSS files") cmd.Flags().BoolVar(&DisableRSS, "disableRSS", false, "Do not build RSS files")
@ -204,6 +205,7 @@ func init() {
} }
func LoadDefaultSettings() { func LoadDefaultSettings() {
viper.SetDefault("cleanDestinationDir", false)
viper.SetDefault("Watch", false) viper.SetDefault("Watch", false)
viper.SetDefault("MetaDataFormat", "toml") viper.SetDefault("MetaDataFormat", "toml")
viper.SetDefault("DisableRSS", false) viper.SetDefault("DisableRSS", false)
@ -281,6 +283,9 @@ func InitializeConfig(subCmdVs ...*cobra.Command) error {
} }
for _, cmdV := range append([]*cobra.Command{hugoCmdV}, subCmdVs...) { for _, cmdV := range append([]*cobra.Command{hugoCmdV}, subCmdVs...) {
if cmdV.Flags().Lookup("cleanDestinationDir").Changed {
viper.Set("cleanDestinationDir", CleanDestination)
}
if cmdV.Flags().Lookup("buildDrafts").Changed { if cmdV.Flags().Lookup("buildDrafts").Changed {
viper.Set("BuildDrafts", Draft) viper.Set("BuildDrafts", Draft)
} }
@ -497,7 +502,7 @@ func copyStatic() error {
syncer.DestFs = hugofs.DestinationFS syncer.DestFs = hugofs.DestinationFS
// Now that we are using a unionFs for the static directories // Now that we are using a unionFs for the static directories
// We can effectively clean the publishDir on initial sync // We can effectively clean the publishDir on initial sync
syncer.Delete = true syncer.Delete = viper.GetBool("cleanDestinationDir")
jww.INFO.Println("syncing static files to", publishDir) jww.INFO.Println("syncing static files to", publishDir)
// because we are using a baseFs (to get the union right). // because we are using a baseFs (to get the union right).