From 9a2771507e0237ffbd858d8343eb999a752d34cc Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 14 Jun 2011 16:02:25 -0500 Subject: [PATCH] support users who chose to set LC_BYOBU=0, since LC_* are passed over SSH by default in Debian/Ubuntu --- debian/changelog | 5 ++--- usr/bin/byobu-launch | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f2a4b444..f45e64ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,8 @@ byobu (4.12) unreleased; urgency=low * usr/bin/byobu-launch: - - switch the disable environment variable to LC_BYOBU=0, since - LC_* are passed over SSH by default in Debian/Ubuntu, and it's - a bit more brief + - support users who chose to set LC_BYOBU=0, since + LC_* are passed over SSH by default in Debian/Ubuntu -- Dustin Kirkland Sun, 12 Jun 2011 23:37:24 -0500 diff --git a/usr/bin/byobu-launch b/usr/bin/byobu-launch index 2d0c488c..e849de4a 100755 --- a/usr/bin/byobu-launch +++ b/usr/bin/byobu-launch @@ -25,12 +25,13 @@ DATA="$HOME/.$PKG" # in addition to the server. # To use over SSH, your /etc/ssh/sshd_config and /etc/ssh/ssh_config # must pass this variable with AcceptEnv and SendEnv. -# Note that LC_* are passed by default on Debian/Ubuntu. -# - So we're going to use a variable name that's not already used (LC_BYOBU): -# http://pubs.opengroup.org/onlinepubs/007908799/xbd/envvar.html +# Note that LC_* are passed by default on Debian/Ubuntu, we'll optionally +# support LC_BYOBU=0 # And in your local bashrc: # $HOME/.bashrc: export LC_BYOBU=0 -if [ "$LC_BYOBU" != 0 ]; then +# or edit your sshd_config, ssh_config, and set: +# $HOME/.bashrc: export BYOBU_DISABLE=1 +if [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DISABLE" != "1"]; then case "$-" in *i*) # Attempt to merge shell history across sessions/windows (works with a few exceptions)