aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.rs
diff options
context:
space:
mode:
authorKunal Mohan <kunalmohan99@gmail.com>2021-05-29 00:32:06 +0530
committerKunal Mohan <kunalmohan99@gmail.com>2021-05-29 00:32:06 +0530
commit0bd05cbcb46d607079608bb83bdefba97bf7a764 (patch)
treed4abb52e544ec5afb8bc23c3ee770492d942ba72 /src/main.rs
parentdocs(changelog): Fix lag #536 (diff)
downloadsl0ppij-0bd05cbcb46d607079608bb83bdefba97bf7a764.tar.gz
sl0ppij-0bd05cbcb46d607079608bb83bdefba97bf7a764.tar.xz
sl0ppij-0bd05cbcb46d607079608bb83bdefba97bf7a764.zip
Make session-name option in attach command
If only one session is running, attach to it. Otherwise list the active sessions (if any)
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs
index efb99156..b9147fab 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,7 @@ mod sessions;
mod tests;
use crate::install::populate_data_dir;
-use sessions::{assert_session, assert_session_ne, list_sessions};
+use sessions::{assert_session, assert_session_ne, get_active_session, list_sessions};
use std::convert::TryFrom;
use std::process;
use zellij_client::{os_input_output::get_client_os_input, start_client, ClientInfo};
@@ -54,16 +54,20 @@ pub fn main() {
}
};
if let Some(Command::Sessions(Sessions::Attach {
- session_name,
+ mut session_name,
force,
})) = opts.command.clone()
{
- assert_session(&session_name);
+ if let Some(session) = session_name.as_ref() {
+ assert_session(session);
+ } else {
+ session_name = Some(get_active_session());
+ }
start_client(
Box::new(os_input),
opts,
config,
- ClientInfo::Attach(session_name, force),
+ ClientInfo::Attach(session_name.unwrap(), force),
);
} else {
let session_name = opts