From fa52f6b6ead0d1d50a8efcafeac012c3fc1591ef Mon Sep 17 00:00:00 2001 From: Michael Diodone Date: Tue, 21 Oct 2014 10:30:54 +0200 Subject: [PATCH] Enabled clean switch for json and gh-deploy commands as well --- mkdocs/build.py | 1 + mkdocs/main.py | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mkdocs/build.py b/mkdocs/build.py index 522c8af6..b0ac6833 100644 --- a/mkdocs/build.py +++ b/mkdocs/build.py @@ -213,6 +213,7 @@ def build(config, live_server=False, dump_json=False, clean_site_dir=False): Perform a full site build. """ if clean_site_dir: + print("Cleaning site directory") utils.clean_directory(config['site_dir']) if not live_server: print("Building documentation to directory: %s" % config['site_dir']) diff --git a/mkdocs/main.py b/mkdocs/main.py index 5c77d3a2..c73bdfac 100755 --- a/mkdocs/main.py +++ b/mkdocs/main.py @@ -24,21 +24,19 @@ def main(cmd, args, options=None): """ Build the documentation, and optionally start the devserver. """ + clean_site_dir = 'clean' in options if cmd == 'serve': config = load_config(options=options) serve(config, options=options) elif cmd == 'build': config = load_config(options=options) - if 'clean' in options: - build(config, clean_site_dir=True) - else: - build(config) + build(config, clean_site_dir=clean_site_dir) elif cmd == 'json': config = load_config(options=options) - build(config, dump_json=True) + build(config, dump_json=True, clean_site_dir=clean_site_dir) elif cmd == 'gh-deploy': config = load_config(options=options) - build(config) + build(config, clean_site_dir=clean_site_dir) gh_deploy(config) elif cmd == 'new': new(args, options)