Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix macos compiler errors

Browse Source
This commit is contained in:
Caelan Sayler
2025-06-16 23:53:53 +01:00
parent 48f6afeb9e
commit 827ed71d0c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/bins/src/shared/util_osx.rs
View File

@@ -1,5 +1,5 @@
use anyhow::{anyhow, bail, Result};
use std::{path::Path, process::Command as Process, time::Duration};
use std::{ffi::OsString, path::Path, process::Command as Process, time::Duration};
use velopack::locator::VelopackLocator;
pub fn wait_for_pid_to_exit(pid: u32, ms_to_wait: u32) -> Result<()> {
@@ -25,16 +25,16 @@ pub fn wait_for_parent_to_exit(ms_to_wait: u32) -> Result<()> {
pub fn force_stop_package<P: AsRef<Path>>(root_dir: P) -> Result<()> {
let root_dir = root_dir.as_ref();
let command = format!("quit app \"{}\"", root_dir);
let command = format!("quit app \"{}\"", root_dir.to_string_lossy().to_string());
Process::new("/usr/bin/osascript").arg("-e").arg(command).spawn().map_err(|z| anyhow!("Failed to stop application ({}).", z))?;
Ok(())
}
pub fn start_package(locator: &VelopackLocator, exe_args: Option<Vec<&str>>, set_env: Option<&str>) -> Result<()> {
let root_dir = locator.get_root_dir_as_string();
let mut args = vec!["-n", &root_dir];
pub fn start_package(locator: &VelopackLocator, exe_args: Option<Vec<OsString>>, set_env: Option<&str>) -> Result<()> {
let root_dir = locator.get_root_dir();
let mut args: Vec<OsString> = vec!["-n".into(), root_dir.into()];
if let Some(a) = exe_args {
args.push("--args");
args.push("--args".into());
args.extend(a);
}
info!("Starting application: open {:?}", args);

2
src/lib-rust/src/bundle.rs
View File

@@ -301,7 +301,7 @@ impl BundleZip<'_> {
#[cfg(target_os = "macos")]
{
if let Err(e) = std::fs::set_permissions(&file_path_on_disk, std::fs::Permissions::from_mode(0o755)) {
warn!("Failed to set mode 755 on '{}': {:?}", file_path_on_disk, e);
warn!("Failed to set mode 755 on '{:?}': {:?}", file_path_on_disk, e);
}
}

2
src/lib-rust/src/locator.rs
View File

@@ -464,7 +464,7 @@ pub fn auto_locate_app_manifest(context: LocationContext) -> Result<VelopackLoca
let metadata_path = contents_dir.join("sq.version");
if !update_exe_path.exists() {
return Err(Error::MissingUpdateExe);
return Err(Error::NotInstalled("UpdateMac does not exist in the expected path".to_owned()));
}
let app = read_current_manifest(&metadata_path)?;