diff --git a/debian/changelog b/debian/changelog index 6b726e06..54034d9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ byobu (5.28) unreleased; urgency=low - * UNRELEASED + * usr/bin/byobu, usr/share/byobu/profiles/common: LP: #1031925 + - 'byobu-screen -t foo' was hanging + - seems that screen's shelltitle command in our common profile + conflicts with the -t option on the command line + - add a hack to byobu that detects this, and avoids hanging + - set title to . otherwise (seems we need one printable character here) -- Dustin Kirkland Mon, 14 Jan 2013 15:27:36 -0600 diff --git a/usr/bin/byobu b/usr/bin/byobu index d2624467..1c18de85 100755 --- a/usr/bin/byobu +++ b/usr/bin/byobu @@ -136,8 +136,22 @@ case $BYOBU_BACKEND in BYOBU_SESSION_NAME="-S $PKG" # Zero out $BYOBU_SESSION_NAME if user has specified a session name for i in "$@"; do - case $i in -*r*|-*d*|-*D*|-*S*|-ls|-list) BYOBU_SESSION_NAME= ;; esac + case $i in + -*r*|-*d*|-*D*|-*S*|-ls|-list) + BYOBU_SESSION_NAME= + ;; + -t) + shelltitle=1 + ;; + esac done + if [ -n "$shelltitle" ]; then + unset shelltitle + unset BYOBU_SHELL_TITLE + else + BYOBU_SHELL_TITLE="-t ." + + fi sessions=$($BYOBU_BACKEND -wipe 2>/dev/null) || true ;; esac @@ -150,7 +164,7 @@ esac if [ "$#" = "0" ]; then if [ "$CUSTOM_WINDOW_SET" = "1" ]; then # Start new custom window set session - exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE + exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE else case "$sessions" in *\(*\)*) @@ -159,13 +173,13 @@ if [ "$#" = "0" ]; then ;; *) # Start new default session - exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $DEFAULT_WINDOW + exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE $DEFAULT_WINDOW ;; esac fi else # Launch with command line args - exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE "$@" + exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE "$@" fi # vi: syntax=sh ts=4 noexpandtab diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common index bce08937..074ae588 100644 --- a/usr/share/byobu/profiles/common +++ b/usr/share/byobu/profiles/common @@ -73,9 +73,6 @@ activity "" # Fit to the current window size, useful with F5/reloads of the profile fit -# Empty shell title by default, maximizes number of windows we can fit, F8 renames easily -shelltitle "" - # Maintain SSH_AUTH_SOCK link setenv SSH_AUTH_SOCK $BYOBU_CONFIG_DIR/.ssh-agent