Enabled clean switch for json and gh-deploy commands as well

This commit is contained in:
Michael Diodone
2014-10-21 10:30:54 +02:00
parent 5d24a5c0c8
commit fa52f6b6ea
2 changed files with 5 additions and 6 deletions

View File

@@ -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'])

View File

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