mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 03:17:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improve readability for check_if_exe_works function.

Browse source
This commit is contained in:
wis31 2025-03-23 20:08:55 -06:00
parent efd8b7bba4
commit 5ec8b49f8a
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
helix-term/build.rs
View file

@ -150,9 +150,9 @@ mod windows_rc {
#[cfg(target_env = "gnu")] #[cfg(target_env = "gnu")]
pub(crate) fn link_icon_in_windows_exe(icon_path: &str) { pub(crate) fn link_icon_in_windows_exe(icon_path: &str) {
let windres_exe = PathBuf::from(r"windres.exe"); let windres_exe = PathBuf::from(r"windres.exe");
check_if_exe_works(&windres_exe).expect( if !check_if_exe_works(&windres_exe) {
"Could not locate windres.exe binary from gnu toolkit in the PATH environment variable.", panic!("Could not locate windres.exe binary from gnu toolkit in the PATH environment variable.")
); };
let output = env::var("OUT_DIR").expect("Env var OUT_DIR should have been set by compiler"); let output = env::var("OUT_DIR").expect("Env var OUT_DIR should have been set by compiler");
let output_dir = PathBuf::from(output); let output_dir = PathBuf::from(output);
@ -193,15 +193,11 @@ mod windows_rc {
} }
#[cfg(target_env = "gnu")] #[cfg(target_env = "gnu")]
fn check_if_exe_works(exe: &PathBuf) -> Result<(), ()> { fn check_if_exe_works(exe: &PathBuf) -> bool {
let output = process::Command::new(exe) process::Command::new(exe)
.arg("--version") // Optional: You can pass an argument to check if the command is working .arg("--version") // Optional: You can pass an argument to check if the command is working
.output(); .output()
.is_okay()
match output {
Ok(_) => Ok(()), // Command exists and ran successfully
Err(_) => Err(()), // Command failed to run
}
} }
fn write_resource_file(rc_path: &Path, icon_path: &str) -> io::Result<()> { fn write_resource_file(rc_path: &Path, icon_path: &str) -> io::Result<()> {