chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4aa9f9a
)
specs: template expand when loading in otter cli
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 8 Jun 2021 00:04:15 +0000
(
01:04
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 8 Jun 2021 00:57:03 +0000
(
01:57
+0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
cli/forgame.rs
patch
|
blob
|
history
diff --git
a/cli/forgame.rs
b/cli/forgame.rs
index e562cd3afd6c84afbd080bb2efe8671522c3ede0..429561435f20a995117a1a8f6ae770b571cb29eb 100644
(file)
--- a/
cli/forgame.rs
+++ b/
cli/forgame.rs
@@
-54,6
+54,10
@@
mod reset_game {
if let Some(filename) = spec_arg_is_path(&args.game_spec) {
let spec_toml = read_spec_from_path(
filename, SpecRaw::<GameSpec>::new())?;
+
+ let spec_toml = bundles::spec_macroexpand(spec_toml, &mut |_,_|Ok(()))
+ .context("failed to template expand game spec")?;
+
MGI::ResetFromGameSpec { spec_toml }
} else {
MGI::ResetFromNamedSpec { spec: args.game_spec.clone() }