Skip to content

Commit de7da04

Browse files
authored
fix(rpm): use product name for output package (#9974)
* fix(rpm): use product name for output package ref: #9375 ref: #9375 (comment) * use kebab-case product-name for rpm * fmt
1 parent 27abecd commit de7da04

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.changes/bundler-rpm-filename.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri-bundler": "patch:bug"
3+
---
4+
5+
Use the `productName` for `rpm` package name instead of main binary name, to be consistent with other bundle types.
6+

tooling/bundler/src/bundle/linux/rpm.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use super::freedesktop;
1818
/// Bundles the project.
1919
/// Returns a vector of PathBuf that shows where the RPM was created.
2020
pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
21-
let name = settings.main_binary_name();
21+
let product_name = settings.product_name();
2222
let version = settings.version_string();
2323
let release = settings.rpm().release.as_str();
2424
let epoch = settings.rpm().epoch;
@@ -30,7 +30,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
3030

3131
let summary = settings.short_description().trim();
3232

33-
let package_base_name = format!("{name}-{version}-{release}.{arch}");
33+
let package_base_name = format!("{product_name}-{version}-{release}.{arch}");
3434
let package_name = format!("{package_base_name}.rpm");
3535

3636
let base_dir = settings.project_out_directory().join("bundle/rpm");
@@ -45,7 +45,8 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
4545
log::info!(action = "Bundling"; "{} ({})", package_name, package_path.display());
4646

4747
let license = settings.license().unwrap_or_default();
48-
let mut builder = rpm::PackageBuilder::new(name, version, &license, arch, summary)
48+
let name = heck::AsKebabCase(settings.product_name()).to_string();
49+
let mut builder = rpm::PackageBuilder::new(&name, version, &license, arch, summary)
4950
.epoch(epoch)
5051
.release(release)
5152
// This matches .deb compression. On a 240MB source binary the bundle will be 100KB larger than rpm's default while reducing build times by ~25%.

0 commit comments

Comments
 (0)