1dba50f42f
This snuck in when Bennet and I were debugging why our connection to the SSH host would break. We suspected that somewhere something was logging to STDOUT and, I guess, we changed all `println!` to `eprintln!`. Now, two weeks later, I'm sitting here, wondering why the version check doesn't work anymore. The server always reports a version of `""`. Turns out we take the command's STDOUT and not STDERR, which is correct. But it also turns out we started to print the version to STDERR, which breaks the version check. One-character bug & one-character fix. Release Notes: - N/A
87 lines
2 KiB
Rust
87 lines
2 KiB
Rust
#![cfg_attr(target_os = "windows", allow(unused, dead_code))]
|
|
|
|
use clap::{Parser, Subcommand};
|
|
use std::path::PathBuf;
|
|
|
|
#[derive(Parser)]
|
|
#[command(disable_version_flag = true)]
|
|
struct Cli {
|
|
#[command(subcommand)]
|
|
command: Option<Commands>,
|
|
}
|
|
|
|
#[derive(Subcommand)]
|
|
enum Commands {
|
|
Run {
|
|
#[arg(long)]
|
|
log_file: PathBuf,
|
|
#[arg(long)]
|
|
pid_file: PathBuf,
|
|
#[arg(long)]
|
|
stdin_socket: PathBuf,
|
|
#[arg(long)]
|
|
stdout_socket: PathBuf,
|
|
#[arg(long)]
|
|
stderr_socket: PathBuf,
|
|
},
|
|
Proxy {
|
|
#[arg(long)]
|
|
reconnect: bool,
|
|
#[arg(long)]
|
|
identifier: String,
|
|
},
|
|
Version,
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn main() {
|
|
unimplemented!()
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
fn main() {
|
|
use remote::proxy::ProxyLaunchError;
|
|
use remote_server::unix::{execute_proxy, execute_run};
|
|
|
|
let cli = Cli::parse();
|
|
|
|
let result = match cli.command {
|
|
Some(Commands::Run {
|
|
log_file,
|
|
pid_file,
|
|
stdin_socket,
|
|
stdout_socket,
|
|
stderr_socket,
|
|
}) => execute_run(
|
|
log_file,
|
|
pid_file,
|
|
stdin_socket,
|
|
stdout_socket,
|
|
stderr_socket,
|
|
),
|
|
Some(Commands::Proxy {
|
|
identifier,
|
|
reconnect,
|
|
}) => match execute_proxy(identifier, reconnect) {
|
|
Ok(_) => Ok(()),
|
|
Err(err) => {
|
|
if let Some(err) = err.downcast_ref::<ProxyLaunchError>() {
|
|
std::process::exit(err.to_exit_code());
|
|
}
|
|
Err(err)
|
|
}
|
|
},
|
|
Some(Commands::Version) => {
|
|
println!("{}", env!("ZED_PKG_VERSION"));
|
|
std::process::exit(0);
|
|
}
|
|
None => {
|
|
eprintln!("usage: remote <run|proxy|version>");
|
|
std::process::exit(1);
|
|
}
|
|
};
|
|
if let Err(error) = result {
|
|
log::error!("exiting due to error: {}", error);
|
|
std::process::exit(1);
|
|
}
|
|
}
|