* usr/bin/byobu-launcher.in: LP: #1338260

- fix byobu autolaunch for TERM=screen-256color users
This commit is contained in:
Dustin Kirkland 2015-08-31 13:10:38 -05:00
commit 1f76f1569b
2 changed files with 6 additions and 13 deletions

3
debian/changelog vendored
View file

@ -1,6 +1,7 @@
byobu (5.97) unreleased; urgency=medium
* UNRELEASED
* usr/bin/byobu-launcher.in: LP: #1338260
- fix byobu autolaunch for TERM=screen-256color users
-- Dustin Kirkland <kirkland@ubuntu.com> Mon, 31 Aug 2015 12:33:21 -0500

View file

@ -30,8 +30,6 @@ if [ -O "$HOME" ]; then
case "$TERM" in
*screen*)
# Handle nesting
if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ]; then
# User explicitly wants nested sessions
if [ -n "$SSH_CONNECTION" ] && [ "$(printf "$SSH_CONNECTION" | awk '{print $1}')" != "$(printf "$SSH_CONNECTION" | awk '{print $3}')" ]; then
# Safeguard against ssh-ing into ourself, which causes an infinite loop
exec $BYOBU_PREFIX/bin/byobu "$@"
@ -40,12 +38,6 @@ if [ -O "$HOME" ]; then
echo "INFO: You can still run 'byobu' manually at the command line, if you know what you're doing" 1>&2
true
fi
else
echo "INFO: Disabling auto-launch of Byobu in this nested session, to avoid a potential infinite loop" 1>&2
echo "INFO: You can still run 'byobu' manually at the command line, if you know what you're doing" 1>&2
echo "INFO: And you can set LC_BYOBU=1 in your environment to override this safeguard.\n" 1>&2
true
fi
;;
dumb)
# Dumb terminal, don't launch