From 4f0f3187c9e69262ef28350331b368c831ab930a Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Fri, 29 Apr 2022 18:29:31 +0200 Subject: [PATCH] fix(cli.rs): fix `tauri info` panic when a package isn't installed, closes #3985 (#3996) --- .changes/cli.rs-info-panic.md | 6 ++++++ tooling/cli/metadata.json | 2 +- tooling/cli/src/info.rs | 10 +--------- 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 .changes/cli.rs-info-panic.md diff --git a/.changes/cli.rs-info-panic.md b/.changes/cli.rs-info-panic.md new file mode 100644 index 000000000..b8fb2ea30 --- /dev/null +++ b/.changes/cli.rs-info-panic.md @@ -0,0 +1,6 @@ +--- +"cli.rs": patch +"cli.js": patch +--- + +Fix `tauri info` panic when a pacakage isn't installed. diff --git a/tooling/cli/metadata.json b/tooling/cli/metadata.json index 8594d123f..dfef2d0bc 100644 --- a/tooling/cli/metadata.json +++ b/tooling/cli/metadata.json @@ -1,7 +1,7 @@ { "cli.js": { "version": "1.0.0-rc.9", - "node": ">= 10" + "node": ">= 10.0.0" }, "tauri": "1.0.0-rc.8", "tauri-build": "1.0.0-rc.7" diff --git a/tooling/cli/src/info.rs b/tooling/cli/src/info.rs index 8f92e4a19..5672f8041 100644 --- a/tooling/cli/src/info.rs +++ b/tooling/cli/src/info.rs @@ -494,7 +494,6 @@ struct VersionBlock { version: String, target_version: String, indentation: usize, - skip_update_check: bool, } impl VersionBlock { @@ -504,15 +503,9 @@ impl VersionBlock { version: version.into(), target_version: "".into(), indentation: 2, - skip_update_check: false, } } - fn skip_update_check(mut self) -> Self { - self.skip_update_check = true; - self - } - fn target_version(mut self, version: impl Into) -> Self { self.target_version = version.into(); self @@ -531,7 +524,7 @@ impl VersionBlock { self.version.clone() } ); - if !self.target_version.is_empty() && !self.skip_update_check { + if !(self.version.is_empty() || self.target_version.is_empty()) { let version = semver::Version::parse(self.version.as_str()).unwrap(); let target_version = semver::Version::parse(self.target_version.as_str()).unwrap(); if version < target_version { @@ -630,7 +623,6 @@ pub fn command(_options: Options) -> Result<()> { .collect::(), ) .target_version(metadata.js_cli.node.replace(">= ", "")) - .skip_update_check() .display(); VersionBlock::new(