github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 14:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/bin/byobu-select-session: LP: #908944

Browse source 
- use attach_session function
This commit is contained in:
Dustin Kirkland 2012-01-25 16:57:15 -06:00
commit 1df4743ad6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -8,6 +8,8 @@ byobu (5.6) unreleased; urgency=low
[ Ryan Thompson ] [ Ryan Thompson ]
* usr/bin/byobu-select-session: LP: #919391 * usr/bin/byobu-select-session: LP: #919391
- read only integers - read only integers
* usr/bin/byobu-select-session: LP: #908944
- use attach_session function
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 18 Jan 2012 19:57:15 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 18 Jan 2012 19:57:15 -0600

8
usr/bin/byobu-select-session
View file

@ -73,6 +73,7 @@ def attach_session(session):
print("Attaching: [%s]\n" % session) print("Attaching: [%s]\n" % session)
update_environment(session) update_environment(session)
backend, session_name = session.split("____", 2) backend, session_name = session.split("____", 2)
# must use the binary, not the wrapper!
if backend == "tmux": if backend == "tmux":
os.execvp("tmux", ["", "-2", "attach", "-t", session_name]) os.execvp("tmux", ["", "-2", "attach", "-t", session_name])
else: else:
@ -114,11 +115,8 @@ if len(sessions) > 1:
choice = "" choice = ""
sys.stderr.write("\nERROR: Invalid input\n"); sys.stderr.write("\nERROR: Invalid input\n");
elif len(sessions) == 1: elif len(sessions) == 1:
# Attach to the only session; must use the binary, not the wrapper! # Auto-select the only session
if BYOBU_BACKEND == "tmux": choice = 1
os.execvp("tmux", ["", "-2", "attach"])
else:
os.execvp("screen", ["", "-AOxRR"])
if choice: if choice:
if sessions[choice-1] == "NEW": if sessions[choice-1] == "NEW":