fix: reimplement path un/install for macos (#3255)

Fixes #3254
lapce · May 10, 2024 · c604f51 · c604f51
1 parent c9f5f8f
commit c604f51
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Update toolchain & add llvm-tools
         run: |
-          rustup update
+          rustup update --no-self-update
           rustup component add llvm-tools-preview
 
       - name: Cache Rust dependencies
@@ -101,7 +101,7 @@ jobs:
 
       - name: Update toolchain & add clippy
         run: |
-          rustup update
+          rustup update --no-self-update
           rustup component add clippy
 
       - name: Install dependencies on Ubuntu

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Update rust
-        run: rustup update
+        run: rustup update --no-self-update
 
       - name: Fetch dependencies
         run: cargo fetch --locked

diff --git a/lapce-app/src/command.rs b/lapce-app/src/command.rs
@@ -712,6 +712,10 @@ pub enum InternalCommand {
         left_path: PathBuf,
         right_path: PathBuf,
     },
+    ExecuteProcess {
+        program: String,
+        arguments: Vec<String>,
+    },
 }
 
 #[derive(Clone)]

diff --git a/lapce-app/src/window_tab.rs b/lapce-app/src/window_tab.rs
@@ -36,7 +36,7 @@ use lapce_rpc::{
 };
 use lsp_types::{Diagnostic, ProgressParams, ProgressToken, ShowMessageParams};
 use serde_json::Value;
-use tracing::{debug, error};
+use tracing::{debug, error, event, Level};
 
 use crate::{
     about::AboutData,
@@ -1273,9 +1273,23 @@ impl WindowTabData {
 
             // ==== Movement ====
             #[cfg(target_os = "macos")]
-            InstallToPATH => {}
+            InstallToPATH => {
+                self.common.internal_command.send(
+                    InternalCommand::ExecuteProcess {
+                        program: String::from("osascript"),
+                        arguments: vec![String::from("-e"), format!(r#"do shell script "ln -sf '{}' /usr/local/bin/lapce" with administrator privileges"#, std::env::args().next().unwrap())],
+                    }
+                )
+            }
             #[cfg(target_os = "macos")]
-            UninstallFromPATH => {}
+            UninstallFromPATH => {
+                self.common.internal_command.send(
+                    InternalCommand::ExecuteProcess {
+                        program: String::from("osascript"),
+                        arguments: vec![String::from("-e"), String::from(r#"do shell script "rm /usr/local/bin/lapce" with administrator privileges"#)],
+                    }
+                )
+            }
             JumpLocationForward => {
                 self.main_split.jump_location_forward(false);
             }
@@ -1695,6 +1709,24 @@ impl WindowTabData {
                 left_path,
                 right_path,
             } => self.main_split.open_diff_files(left_path, right_path),
+            InternalCommand::ExecuteProcess { program, arguments } => {
+                let mut cmd = match std::process::Command::new(program)
+                    .args(arguments)
+                    .spawn()
+                {
+                    Ok(v) => v,
+                    Err(e) => {
+                        return event!(Level::ERROR, "Failed to spawn process: {e}")
+                    }
+                };
+
+                match cmd.wait() {
+                    Ok(v) => event!(Level::TRACE, "Process exited with status {v}"),
+                    Err(e) => {
+                        event!(Level::ERROR, "Proces exited with an error: {e}")
+                    }
+                };
+            }
         }
     }