Skip to content

fix: check makensis exit code #15429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Legend-Master merged 2 commits into from
May 23, 2026
Merged

fix: check makensis exit code #15429

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1083449
fix: check makensis exit code
Legend-Master May 22, 2026
46db372
Merge branch 'dev' of https://github.com/tauri-apps/tauri into check-…
Legend-Master May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions crates/tauri-bundler/src/bundle/windows/nsis/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::{
},
},
},
error::ErrorExt,
error::{bail, ErrorExt},
utils::{
http_utils::{download_and_verify, verify_file_hash, HashAlgorithm},
CommandExt,
Expand Down Expand Up @@ -657,7 +657,7 @@ fn build_nsis_app_installer(
);

let nsis_output_path = output_path.join(out_file);
let nsis_installer_path = settings.project_out_directory().to_path_buf().join(format!(
let nsis_installer_path = settings.project_out_directory().join(format!(
"bundle/{}/{}.exe",
if updater {
NSIS_UPDATER_OUTPUT_FOLDER_NAME
Expand Down Expand Up @@ -690,7 +690,7 @@ fn build_nsis_app_installer(
#[cfg(not(target_os = "windows"))]
let mut nsis_cmd = Command::new("makensis");

nsis_cmd
let status = nsis_cmd
.args(["-INPUTCHARSET", "UTF8", "-OUTPUTCHARSET", "UTF8"])
.arg(match settings.log_level() {
log::Level::Error => "-V1",
Expand All @@ -707,6 +707,9 @@ fn build_nsis_app_installer(
command: "makensis.exe".to_string(),
error,
})?;
if !status.success() {
bail!("Failed to bundle app with makensis");
Comment thread
amrbashir marked this conversation as resolved.
}

fs::rename(nsis_output_path, &nsis_installer_path)?;

Expand Down
Loading