From 576079474704e03e646da2eee5e45e28e8a35edc Mon Sep 17 00:00:00 2001 From: southerntofu Date: Tue, 1 Dec 2020 18:19:31 +0100 Subject: [PATCH] Reorder tasks before debug print, rename GITBUILDCONF to FORGEBUILDCONF --- src/main.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index e131892..bca60c3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -52,20 +52,21 @@ fn main() -> Result<(), std::io::Error> { } }; - for t in &tasks { - t.debug("found_task"); - } - - let (config_folder, ignored_tasks) = task::config(&basedir); - set_var("GITBUILDCONF", &config_folder); - context.insert("$i18n_config".to_string(), config_folder.to_str().unwrap().to_string()); - log::info("config", &context); - // Reorder tasks alphanumerically tasks.sort_unstable_by_key(|t| t.name.clone()); // Remove duplicates, in case a task was called along // the corresponding source URL (so we'd be tempted to call the task twice) tasks.dedup_by_key(|t| t.name.clone()); + + for t in &tasks { + t.debug("found_task"); + } + + let (config_folder, ignored_tasks) = task::config(&basedir); + set_var("FORGEBUILDCONF", &config_folder); + context.insert("$i18n_config".to_string(), config_folder.to_str().unwrap().to_string()); + log::info("config", &context); + for task in &tasks { task.debug("start_proc");