emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix serve not working with config flag

Browse source 
Closes #294
This commit is contained in:
Vincent Prouillet 2018-04-26 10:58:59 +02:00
parent a060646b9e
commit 50a79c52f3
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,5 +1,10 @@
# Changelog # Changelog
## 0.4.0 (unreleased)
- Fix `serve` not working with the config flag
## 0.3.4 (2018-06-22) ## 0.3.4 (2018-06-22)
- `cargo update` as some dependencies didn't compile with current Rust version - `cargo update` as some dependencies didn't compile with current Rust version

4
src/cmd/serve.rs
View file

@ -115,8 +115,8 @@ pub fn serve(interface: &str, port: &str, output_dir: &str, base_url: &str, conf
.chain_err(|| "Can't watch the `content` folder. Does it exist?")?; .chain_err(|| "Can't watch the `content` folder. Does it exist?")?;
watcher.watch("templates/", RecursiveMode::Recursive) watcher.watch("templates/", RecursiveMode::Recursive)
.chain_err(|| "Can't watch the `templates` folder. Does it exist?")?; .chain_err(|| "Can't watch the `templates` folder. Does it exist?")?;
watcher.watch("config.toml", RecursiveMode::Recursive) watcher.watch(config_file, RecursiveMode::Recursive)
.chain_err(|| "Can't watch the `config.toml` file. Does it exist?")?; .chain_err(|| "Can't watch the `config` file. Does it exist?")?;
if Path::new("static").exists() { if Path::new("static").exists() {
watching_static = true; watching_static = true;