From eb5eb5283a6fe9dba55b7d9ff0f88ce23b1d91a8 Mon Sep 17 00:00:00 2001 From: Tim-Paik Date: Sun, 1 May 2022 16:43:11 +0800 Subject: [PATCH] fix: initialization_script now reads the same way as html --- neutauri_bundler/src/data.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/neutauri_bundler/src/data.rs b/neutauri_bundler/src/data.rs index a52681f..ef9e058 100644 --- a/neutauri_bundler/src/data.rs +++ b/neutauri_bundler/src/data.rs @@ -66,7 +66,7 @@ pub struct Config { pub spa: bool, pub url: Option, pub html: Option, - pub initialization_script: Option, + pub initialization_script: Option, } #[derive(Serialize, Deserialize, Clone, Debug, Default)] @@ -248,7 +248,7 @@ impl Default for Config { spa: false, url: Some("/index.html".into()), html: None, - initialization_script: Some("".into()), + initialization_script: None, } } } @@ -284,12 +284,9 @@ impl Config { Some(path) => fs::read_to_string(path.as_path()).ok(), None => None, }, - initialization_script: { - if let Some(script_path) = &self.initialization_script { - fs::read_to_string(Path::new(script_path)).ok() - } else { - None - } + initialization_script: match &self.initialization_script { + Some(path) => fs::read_to_string(path.as_path()).ok(), + None => None, }, }) }