byobu, byobu-select-session: name new byobu sessions, only select byobu

sessions, LP: #599334
This commit is contained in:
Dustin Kirkland 2010-06-28 07:13:21 -05:00
commit 7e81b43619
3 changed files with 7 additions and 4 deletions

2
debian/changelog vendored
View file

@ -22,6 +22,8 @@ byobu (2.81) unreleased; urgency=low
* debian/release,sh, debian/release-build.sh: drop, no longer needed, * debian/release,sh, debian/release-build.sh: drop, no longer needed,
now in lp:~kirkland/+junk/bin now in lp:~kirkland/+junk/bin
* usr/bin/byobu-janitor: clean up launch gardening code * usr/bin/byobu-janitor: clean up launch gardening code
* byobu, byobu-select-session: name new byobu sessions, only select byobu
sessions, LP: #599334
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 16 Jun 2010 12:46:29 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 16 Jun 2010 12:46:29 -0500

View file

@ -70,7 +70,7 @@ if [ "$#" = "0" ]; then
out=$(screen -wipe 2>/dev/null) || true out=$(screen -wipe 2>/dev/null) || true
if [ "$CUSTOM_WINDOW_SET" = "1" ]; then if [ "$CUSTOM_WINDOW_SET" = "1" ]; then
# Start new custom window set session # Start new custom window set session
exec screen $SCREEN_TERM $PROFILE exec screen $SCREEN_TERM -S $PKG $PROFILE
else else
case "$out" in case "$out" in
*\(*\)*) *\(*\)*)
@ -79,11 +79,11 @@ if [ "$#" = "0" ]; then
;; ;;
*) *)
# Start new default session # Start new default session
exec screen $SCREEN_TERM $PROFILE $DEFAULT_WINDOW exec screen $SCREEN_TERM -S $PKG $PROFILE $DEFAULT_WINDOW
;; ;;
esac esac
fi fi
else else
# Launch with command line args # Launch with command line args
exec screen $SCREEN_TERM $PROFILE "$@" exec screen $SCREEN_TERM -S $PKG $PROFILE "$@"
fi fi

View file

@ -20,12 +20,13 @@
import commands, os, sys import commands, os, sys
PKG = "byobu"
SHELL = os.getenv("SHELL", "/bin/bash") SHELL = os.getenv("SHELL", "/bin/bash")
sessions = [] sessions = []
choice = "" choice = ""
sessions.append(0) sessions.append(0)
i = 0 i = 0
output = commands.getoutput('screen -ls | sed "s/\s\+/ /g" | grep "^\s"') output = commands.getoutput('screen -ls "' + PKG + '" | sed "s/\s\+/ /g" | grep "^\s"')
if output: if output:
for s in output.split("\n"): for s in output.split("\n"):
items = s.split(" ") items = s.split(" ")