diff options
| author | Ken Matsui <26405363+ken-matsui@users.noreply.github.com> | 2021-11-10 17:02:17 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 09:02:17 +0100 |
| commit | 6d60d83e5808d3ccc5073f9f92368f38b8f3ae41 (patch) | |
| tree | 89d7c43cbdf7e71c6e6c11a20bf96379904e39a0 /src | |
| parent | 03f58fc184bc1be47a8da526563e60a21a1fced0 (diff) | |
fix(envs): Unify operation of Zellij environment variables (#842)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sessions.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sessions.rs b/src/sessions.rs index 31c4df4ef..a13c6c7c1 100644 --- a/src/sessions.rs +++ b/src/sessions.rs @@ -3,6 +3,7 @@ use std::time::SystemTime; use std::{fs, io, process}; use zellij_utils::{ consts::ZELLIJ_SOCK_DIR, + envs, interprocess::local_socket::LocalSocketStream, ipc::{ClientToServerMsg, IpcSenderWithContext}, }; @@ -66,7 +67,7 @@ fn assert_socket(name: &str) -> bool { } pub(crate) fn print_sessions(sessions: Vec<String>) { - let curr_session = std::env::var("ZELLIJ_SESSION_NAME").unwrap_or_else(|_| "".into()); + let curr_session = envs::get_session_name().unwrap_or_else(|_| "".into()); sessions.iter().for_each(|session| { let suffix = if curr_session == *session { " (current)" @@ -78,7 +79,7 @@ pub(crate) fn print_sessions(sessions: Vec<String>) { } pub(crate) fn print_sessions_with_index(sessions: Vec<String>) { - let curr_session = std::env::var("ZELLIJ_SESSION_NAME").unwrap_or_else(|_| "".into()); + let curr_session = envs::get_session_name().unwrap_or_else(|_| "".into()); for (i, session) in sessions.iter().enumerate() { let suffix = if curr_session == *session { " (current)" |