diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1929969..50bde66 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -685,6 +685,7 @@ jobs: git \ rust \ libiconv \ + bzip2 \ gettext-tools \ autoconf \ automake \ diff --git a/apps/gpservice/src/cli.rs b/apps/gpservice/src/cli.rs index 4b579eb..f4c0883 100644 --- a/apps/gpservice/src/cli.rs +++ b/apps/gpservice/src/cli.rs @@ -122,6 +122,7 @@ impl Cli { )); let mut vpn_task = VpnTask::new(ws_req_rx, vpn_state_tx, externally_brokered, trusted_csd_uid); + #[cfg(target_os = "macos")] let idle_vpn_state_rx = vpn_state_rx.clone(); let ws_server = WsServer::new( env!("CARGO_PKG_VERSION"), diff --git a/apps/gpservice/src/vpn_script/privileged_unix.rs b/apps/gpservice/src/vpn_script/privileged_unix.rs index 44a82bc..a3359bc 100644 --- a/apps/gpservice/src/vpn_script/privileged_unix.rs +++ b/apps/gpservice/src/vpn_script/privileged_unix.rs @@ -5,7 +5,8 @@ use super::selection::{ScriptSource, select}; pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow::Result { let installed = gpservice::vpnc_script::installed_script()?; - match select(installed.as_deref(), args.vpnc_script()) { + let legacy = args.vpnc_script(); + match select(installed.as_deref(), legacy.as_deref()) { ScriptSource::Installed(path) => { Ok(Vpn::builder(server, cookie).script_path(Some(path.to_string_lossy().into_owned()))) } diff --git a/crates/gpapi/src/process/mod.rs b/crates/gpapi/src/process/mod.rs index 135a825..502b2f9 100644 --- a/crates/gpapi/src/process/mod.rs +++ b/crates/gpapi/src/process/mod.rs @@ -1,7 +1,9 @@ -pub(crate) mod command_traits; +mod command_traits; mod desktop_session_env; pub(crate) mod gui_helper_launcher; +pub use command_traits::CommandExt; + pub mod auth_launcher; pub mod gui_launcher; pub mod hip_launcher;