diff --git a/src/bin/dosh-client.rs b/src/bin/dosh-client.rs index ff0fb90..4dcf0ce 100644 --- a/src/bin/dosh-client.rs +++ b/src/bin/dosh-client.rs @@ -260,7 +260,7 @@ async fn main() -> Result<()> { return run_file_cat_command(&args); } if args.server.as_deref() == Some("update") { - return run_update(&config, update_check_requested(&args.command)?); + return run_update(&config, parse_update_options(&args.command)?); } if args.server.as_deref() == Some("setup") { return run_setup_command(&config, &args).await; @@ -2842,14 +2842,85 @@ fn run_remote_script( Ok(()) } -fn update_check_requested(command: &[String]) -> Result { - match command { - [] => Ok(false), - [flag] if flag == "--check" || flag == "-n" => Ok(true), - _ => Err(anyhow!("usage: dosh update [--check]")), +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +enum UpdateRole { + Auto, + Client, + Server, + Both, +} + +impl UpdateRole { + fn installer_arg(self) -> &'static str { + match self { + UpdateRole::Auto => { + if local_server_install_detected() { + "both" + } else { + "client" + } + } + UpdateRole::Client => "client", + UpdateRole::Server => "server", + UpdateRole::Both => "both", + } } } +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +struct UpdateOptions { + check_only: bool, + role: UpdateRole, +} + +fn parse_update_options(command: &[String]) -> Result { + let mut options = UpdateOptions { + check_only: false, + role: UpdateRole::Auto, + }; + for arg in command { + match arg.as_str() { + "--check" | "-n" => options.check_only = true, + "--client" => options.role = update_role_flag(options.role, UpdateRole::Client)?, + "--server" => options.role = update_role_flag(options.role, UpdateRole::Server)?, + "--both" => options.role = update_role_flag(options.role, UpdateRole::Both)?, + _ => { + return Err(anyhow!( + "usage: dosh update [--check] [--client|--server|--both]" + )); + } + } + } + Ok(options) +} + +fn update_role_flag(current: UpdateRole, requested: UpdateRole) -> Result { + if current != UpdateRole::Auto && current != requested { + return Err(anyhow!("choose only one of --client, --server, or --both")); + } + Ok(requested) +} + +fn local_server_install_detected() -> bool { + if cfg!(windows) { + return false; + } + let service = dirs::home_dir() + .map(|home| home.join(".config/systemd/user/dosh-server.service")) + .filter(|path| path.exists()) + .is_some(); + if service { + return true; + } + let Ok(exe) = std::env::current_exe() else { + return false; + }; + let Some(bin_dir) = exe.parent() else { + return false; + }; + bin_dir.join("dosh-server").exists() || bin_dir.join("dosh-server.exe").exists() +} + fn release_artifact_name() -> &'static str { match (std::env::consts::OS, std::env::consts::ARCH) { ("macos", "aarch64") => "dosh-macos-aarch64.tar.gz", @@ -2968,7 +3039,7 @@ fn url_reachable(url: &str) -> Result { Ok(status.success()) } -fn run_update(config: &dosh::config::ClientConfig, check_only: bool) -> Result<()> { +fn run_update(config: &dosh::config::ClientConfig, options: UpdateOptions) -> Result<()> { let repo = config .update_repo .clone() @@ -2976,12 +3047,14 @@ fn run_update(config: &dosh::config::ClientConfig, check_only: bool) -> Result<( let raw_base = raw_base_from_repo(&repo); let installer = format!("{raw_base}/raw/branch/main/install.sh"); let artifact = release_artifact_name(); - if check_only { + let installer_role = options.role.installer_arg(); + if options.check_only { let local_version = env!("CARGO_PKG_VERSION"); let latest_tag = latest_release_tag(&repo)?; println!("dosh {local_version}"); println!("repo: {repo}"); println!("installer: {installer}"); + println!("role: {installer_role}"); match latest_tag.as_deref() { Some(tag) => { let latest_version = release_version_from_tag(tag); @@ -3018,12 +3091,13 @@ fn run_update(config: &dosh::config::ClientConfig, check_only: bool) -> Result<( .join("source"); let use_prebuilt = std::env::var("DOSH_USE_PREBUILT").unwrap_or_else(|_| "1".to_string()); let mut script = format!( - "curl -fsSL {} | DOSH_REPO={} DOSH_PORT={} DOSH_UPDATE_CACHE={} DOSH_UPDATE_QUIET=1 DOSH_USE_PREBUILT={} sh -s -- client", + "curl -fsSL {} | DOSH_REPO={} DOSH_PORT={} DOSH_UPDATE_CACHE={} DOSH_UPDATE_QUIET=1 DOSH_USE_PREBUILT={} sh -s -- {}", shell_word(&installer), shell_word(&repo), config.update_port.unwrap_or(config.dosh_port), shell_word(&update_cache.display().to_string()), - shell_word(&use_prebuilt) + shell_word(&use_prebuilt), + shell_word(installer_role) ); if config.server != "user@example.com" { script.push_str(&format!(" --server {}", shell_word(&config.server))); @@ -7565,11 +7639,12 @@ mod tests { FRAME_GAP_RESYNC_AFTER_MS, FrameBuffer, LocalForward, MAX_PENDING_USER_INPUT_BYTES, POST_SUBMIT_ALL_INPUT_HOLD, PendingStreamOpen, PredictMode, Predictor, RESTART_STATUS_SCRIPT, RemoteForward, STARTUP_INPUT_HOLD, SshConfig, StartupGateMode, - StatusAction, auth_allows, cache_key, cache_server_prefix, cleanup_stream_state, - clear_cached_credentials, ensure_tui_safe_status_overlay, input_contains_focus_in, - input_matches_escape, is_local_status_target, is_resume_response_for_client, - latest_release_download_url, load_first_native_identity_with_prompt, parse_dynamic_forward, - parse_escape_key, parse_local_forward, parse_remote_forward, parse_ssh_config, + StatusAction, UpdateOptions, UpdateRole, auth_allows, cache_key, cache_server_prefix, + cleanup_stream_state, clear_cached_credentials, ensure_tui_safe_status_overlay, + input_contains_focus_in, input_matches_escape, is_local_status_target, + is_resume_response_for_client, latest_release_download_url, + load_first_native_identity_with_prompt, parse_dynamic_forward, parse_escape_key, + parse_local_forward, parse_remote_forward, parse_ssh_config, parse_update_options, post_submit_hold_duration, queue_pending_user_input, raw_contains_host_table, recv_response_until, refresh_live_addr, release_tag_download_url, release_tag_from_effective_url, release_version_from_tag, render_status_clear, @@ -7580,8 +7655,7 @@ mod tests { should_repaint_idle_alternate_screen, split_after_command_submit, ssh_destination_host, ssh_username, ssh_with_user, startup_command, status_ssh_target, strip_stale_mouse_reports, strip_terminal_focus_reports, terminal_private_mode_transition, toml_bare_key_or_quoted, - update_check_requested, update_version_status, upsert_managed_block, valid_forward_host, - vscode_safe_alias, + update_version_status, upsert_managed_block, valid_forward_host, vscode_safe_alias, }; use dosh::config::{ClientConfig, CommandExtension, HostConfig}; use dosh::native::EnvVar; @@ -8695,12 +8769,37 @@ mod tests { } #[test] - fn update_check_accepts_only_check_flag() { - assert!(!update_check_requested(&[]).unwrap()); - assert!(update_check_requested(&["--check".to_string()]).unwrap()); - assert!(update_check_requested(&["-n".to_string()]).unwrap()); - assert!(update_check_requested(&["--wat".to_string()]).is_err()); - assert!(update_check_requested(&["--check".to_string(), "extra".to_string()]).is_err()); + fn update_options_accept_check_and_role_flags() { + assert_eq!( + parse_update_options(&[]).unwrap(), + UpdateOptions { + check_only: false, + role: UpdateRole::Auto, + } + ); + assert_eq!( + parse_update_options(&["--check".to_string()]).unwrap(), + UpdateOptions { + check_only: true, + role: UpdateRole::Auto, + } + ); + assert_eq!( + parse_update_options(&["-n".to_string(), "--server".to_string()]).unwrap(), + UpdateOptions { + check_only: true, + role: UpdateRole::Server, + } + ); + assert_eq!( + parse_update_options(&["--both".to_string()]).unwrap(), + UpdateOptions { + check_only: false, + role: UpdateRole::Both, + } + ); + assert!(parse_update_options(&["--wat".to_string()]).is_err()); + assert!(parse_update_options(&["--client".to_string(), "--server".to_string()]).is_err()); } #[test]