fixed 'add' command enforcing nest flag on detached sessions
This commit is contained in:
parent
44bad997cb
commit
97f546a69c
2 changed files with 14 additions and 3 deletions
|
@ -173,12 +173,15 @@ pub fn list() {
|
|||
|
||||
pub fn new(state: &mut State) {
|
||||
util::terminal_enforce();
|
||||
state.nest_init();
|
||||
|
||||
// get optional flags
|
||||
let detached = state.flags.detached;
|
||||
let target_dir: Result<String, Error> = state.args.value_from_str(flag::TARGET);
|
||||
|
||||
// delayed nest_init; detached behavior conflicts with nest
|
||||
if !detached { state.nest_init(); }
|
||||
else if state.flags.nested { error::conflict_nest(Some("detached session is not nesting")); }
|
||||
|
||||
// get environment variables
|
||||
let window_name = env_var(env::NEW_WINDOW_NAME);
|
||||
|
||||
|
|
12
src/error.rs
12
src/error.rs
|
@ -39,12 +39,20 @@ pub fn not_terminal() {
|
|||
|
||||
/// tried to nest while not in a session; code 6
|
||||
pub fn not_nesting() {
|
||||
println!("remux: cannot use nesting flag outside a TMUX session");
|
||||
println!("remux: inappropriate nesting flag (-n); not in a session");
|
||||
exit(6);
|
||||
}
|
||||
|
||||
/// operation requires nesting flag; code 6
|
||||
pub fn prevent_nest() {
|
||||
println!("remux: cannot nest sessions without the nest flag ('-n')");
|
||||
println!("remux: the nesting flag (-n) is required for nesting operation");
|
||||
exit(6);
|
||||
}
|
||||
|
||||
/// operation conflicts with nesting flag; code 6
|
||||
pub fn conflict_nest(reason: Option<&'static str>) {
|
||||
if let Some(reason) = reason { println!("remux: inappropriate nesting flag (-n): {reason}"); }
|
||||
else { println!("remux: nesting flag (-n) is inappropriate for this operation."); }
|
||||
exit(6);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue