diff --git a/.changes/bundler-license.md b/.changes/bundler-license.md new file mode 100644 index 000000000..d71414cd2 --- /dev/null +++ b/.changes/bundler-license.md @@ -0,0 +1,5 @@ +--- +'tauri-bundler': 'patch:bug' +--- + +Fix NSIS installer always containing a license page even though `licenseFile` option is not set in the config. diff --git a/.changes/bundler-rpm-license.md b/.changes/bundler-rpm-license.md new file mode 100644 index 000000000..f8152363b --- /dev/null +++ b/.changes/bundler-rpm-license.md @@ -0,0 +1,5 @@ +--- +"tauri-bundler": patch:bug +--- + +Don't fallback to `licenseFile` and use only `license` field when building RPM. \ No newline at end of file diff --git a/tooling/bundler/src/bundle/linux/rpm.rs b/tooling/bundler/src/bundle/linux/rpm.rs index 5eab2571e..d34d6bec4 100644 --- a/tooling/bundler/src/bundle/linux/rpm.rs +++ b/tooling/bundler/src/bundle/linux/rpm.rs @@ -45,10 +45,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result> { info!(action = "Bundling"; "{} ({})", package_name, package_path.display()); - let license = settings - .license_file() - .map(|l| std::fs::read_to_string(l).expect("failed to read license")) - .unwrap_or_default(); + let license = settings.license().unwrap_or_default(); let mut builder = rpm::PackageBuilder::new(name, version, &license, arch, summary) .epoch(epoch) .release(release); diff --git a/tooling/bundler/src/bundle/settings.rs b/tooling/bundler/src/bundle/settings.rs index c93e2d5d1..17b92d265 100644 --- a/tooling/bundler/src/bundle/settings.rs +++ b/tooling/bundler/src/bundle/settings.rs @@ -894,17 +894,14 @@ impl Settings { } } + /// Returns the bundle license. + pub fn license(&self) -> Option { + self.bundle_settings.license.clone() + } + /// Returns the bundle license file. pub fn license_file(&self) -> Option { - self.bundle_settings.license_file.clone().or_else(|| { - self.bundle_settings.license.as_deref().map(|l| { - let p = self - .project_out_directory() - .join(format!("{}-license", self.bundle_identifier())); - std::fs::write(&p, l).expect("failed to write license to a temp file"); - p - }) - }) + self.bundle_settings.license_file.clone() } /// Returns the package's homepage URL, defaulting to "" if not defined.