diff --git a/Cargo.lock b/Cargo.lock index d170730..d51f355 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1111,7 +1111,7 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "rexec" -version = "1.3.0" +version = "1.3.1" dependencies = [ "brace-expand", "clap 4.3.4", diff --git a/Cargo.toml b/Cargo.toml index 0dbd0e2..3841360 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rexec" -version = "1.3.0" +version = "1.3.1" readme = "https://github.com/house-of-vanity/rexec#readme" edition = "2021" description = "Parallel SSH executor" diff --git a/src/main.rs b/src/main.rs index eec4185..1fa83b2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,7 +25,7 @@ use regex::Regex; #[command(author = "AB ab@hexor.ru", version, about = "Parallel SSH executor in Rust", long_about = None)] struct Args { /// Username for SSH connections (defaults to current system user) - #[arg(short, long, default_value_t = whoami::username())] + #[arg(short = 'u', short = 'l', long, default_value_t = whoami::username())] username: String, /// Flag to use known_hosts file for server discovery instead of pattern expansion @@ -316,11 +316,11 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf let display_name_stdout = display_name.clone(); let stdout_thread = thread::spawn(move || { let reader = BufReader::new(stdout); - let prefix = format!("{}", "│".green()); + let prefix = format!("{}", "║".green()); for line in reader.lines() { match line { - Ok(line) => println!("{} {} - {}", prefix, display_name_stdout.yellow(), line), + Ok(line) => println!("{} {} {} {}", prefix, display_name_stdout.yellow(), prefix, line), Err(_) => break, } } @@ -335,7 +335,7 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf for line in reader.lines() { match line { - Ok(line) => println!("{} {} - {}", prefix, display_name_stderr.yellow(), line), + Ok(line) => println!("{} {} {} {}", prefix, display_name_stderr.yellow(), prefix, line), Err(_) => break, } } @@ -701,4 +701,4 @@ fn main() { // Use the embedded massh library implementation execute_with_massh(&valid_hosts, &args.username, &args.command, args.parallel, args.code, &common_suffix); } -} \ No newline at end of file +}