mirror of
https://github.com/tauri-apps/tauri.git
synced 2024-09-11 07:55:34 +03:00
fix(nsis): always pass default compression even if nsis object is not defined
This commit is contained in:
parent
de7da04a62
commit
30bc3d2095
@ -245,16 +245,6 @@ fn build_nsis_app_installer(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
data.insert(
|
|
||||||
"compression",
|
|
||||||
to_json(match &nsis.compression {
|
|
||||||
NsisCompression::Zlib => "zlib",
|
|
||||||
NsisCompression::Bzip2 => "bzip2",
|
|
||||||
NsisCompression::Lzma => "lzma",
|
|
||||||
NsisCompression::None => "none",
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
data.insert(
|
data.insert(
|
||||||
"display_language_selector",
|
"display_language_selector",
|
||||||
to_json(nsis.display_language_selector && languages.len() > 1),
|
to_json(nsis.display_language_selector && languages.len() > 1),
|
||||||
@ -265,6 +255,23 @@ fn build_nsis_app_installer(
|
|||||||
data.insert("installer_hooks", to_json(installer_hooks));
|
data.insert("installer_hooks", to_json(installer_hooks));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let compression = settings
|
||||||
|
.windows()
|
||||||
|
.nsis
|
||||||
|
.as_ref()
|
||||||
|
.map(|n| n.compression)
|
||||||
|
.unwrap_or_default();
|
||||||
|
data.insert(
|
||||||
|
"compression",
|
||||||
|
to_json(match compression {
|
||||||
|
NsisCompression::Zlib => "zlib",
|
||||||
|
NsisCompression::Bzip2 => "bzip2",
|
||||||
|
NsisCompression::Lzma => "lzma",
|
||||||
|
NsisCompression::None => "none",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
data.insert(
|
data.insert(
|
||||||
"install_mode",
|
"install_mode",
|
||||||
to_json(match install_mode {
|
to_json(match install_mode {
|
||||||
|
Loading…
Reference in New Issue
Block a user