diff --git a/core/src/proxy.rs b/core/src/proxy.rs index bf7ceb84..84fa4604 100644 --- a/core/src/proxy.rs +++ b/core/src/proxy.rs @@ -1,6 +1,5 @@ use std::collections::HashMap; use std::io::BufReader; -use std::os::unix::prelude::CommandExt; use std::process::Command; use std::process::Stdio; use std::thread; @@ -12,7 +11,6 @@ use crossbeam_utils::sync::WaitGroup; use druid::{ExtEventSink, WidgetId}; use druid::{Target, WindowId}; -use lapce_proxy::dispatch::VERSION; use lapce_proxy::dispatch::{FileNodeItem, NewBufferResponse}; use lapce_proxy::plugin::PluginDescription; use lapce_proxy::terminal::TermId; @@ -37,6 +35,8 @@ use crate::terminal::RawTerminal; use crate::{buffer::BufferId, command::LAPCE_UI_COMMAND}; +const VERSION: &str = env!("CARGO_PKG_VERSION"); + pub enum TermEvent { NewTerminal(Arc>), UpdateContent(String), @@ -119,7 +119,7 @@ pub fn start(&self, workspace: LapceWorkspace, event_sink: ExtEventSink) { .arg("ControlPath=~/.ssh/cm-%r@%h:%p") .arg("-o") .arg("ControlPersist=30m") - .arg("/tmp/proxy/target/release/lapce-proxy") + .arg(format!("~/.lapce/lapce-proxy-{}", VERSION)) .stdin(Stdio::piped()) .stdout(Stdio::piped()) .spawn() diff --git a/proxy/src/dispatch.rs b/proxy/src/dispatch.rs index 31493b14..28ac7730 100644 --- a/proxy/src/dispatch.rs +++ b/proxy/src/dispatch.rs @@ -25,8 +25,6 @@ use xi_core_lib::watcher::{EventQueue, FileWatcher, Notify, WatchToken}; use xi_rope::{RopeDelta, RopeInfo}; -pub const VERSION: &str = env!("CARGO_PKG_VERSION"); - pub const OPEN_FILE_EVENT_TOKEN: WatchToken = WatchToken(1); pub const GIT_EVENT_TOKEN: WatchToken = WatchToken(2);