open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): improve handling of macOS env-path register command

Browse Source
This commit is contained in:
Federico Terzi 2021-11-01 17:43:54 +01:00
parent 30de95adef
commit b470aaad8a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
espanso/src/path/macos.rs
View File

@ -42,8 +42,10 @@ pub fn add_espanso_to_path(prompt_when_necessary: bool) -> Result<()> {
ErrorKind::PermissionDenied if prompt_when_necessary => { ErrorKind::PermissionDenied if prompt_when_necessary => {
warn!("target link file can't be accessed with current permissions, requesting elevated ones through AppleScript."); warn!("target link file can't be accessed with current permissions, requesting elevated ones through AppleScript.");
create_link_with_applescript(&exec_path, &target_link_path) create_dir_and_link_with_applescript(&exec_path, &target_link_path)
.context("unable to create link with AppleScript")?; .context("unable to create link with AppleScript")?;
return Ok(());
} }
_other_error => { _other_error => {
return Err(PathError::SymlinkError(error).into()); return Err(PathError::SymlinkError(error).into());
@ -57,8 +59,10 @@ pub fn add_espanso_to_path(prompt_when_necessary: bool) -> Result<()> {
ErrorKind::PermissionDenied if prompt_when_necessary => { ErrorKind::PermissionDenied if prompt_when_necessary => {
warn!("target link file can't be accessed with current permissions, requesting elevated ones through AppleScript."); warn!("target link file can't be accessed with current permissions, requesting elevated ones through AppleScript.");
create_link_with_applescript(&exec_path, &target_link_path) create_dir_and_link_with_applescript(&exec_path, &target_link_path)
.context("unable to create link with AppleScript")?; .context("unable to create link with AppleScript")?;
return Ok(());
} }
_other_error => { _other_error => {
return Err(PathError::SymlinkError(error).into()); return Err(PathError::SymlinkError(error).into());
@ -69,7 +73,7 @@ pub fn add_espanso_to_path(prompt_when_necessary: bool) -> Result<()> {
Ok(()) Ok(())
} }
fn create_link_with_applescript(exec_path: &Path, target_link_path: &Path) -> Result<()> { fn create_dir_and_link_with_applescript(exec_path: &Path, target_link_path: &Path) -> Result<()> {
let params = format!( let params = format!(
r##"do shell script "mkdir -p /usr/local/bin && ln -sf '{}' '{}'" with administrator privileges"##, r##"do shell script "mkdir -p /usr/local/bin && ln -sf '{}' '{}'" with administrator privileges"##,
exec_path.to_string_lossy(), exec_path.to_string_lossy(),