diff --git a/debian/changelog b/debian/changelog index 8ed9fb96..2d55e461 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -byobu (2.75) unreleased; urgency=low +byobu (2.75) UNRELEASED; urgency=low - * UNRELEASED + * usr/bin/byobu: ensure that .screenrc gets sourced if byobu is run + with arguments, LP: #580760 - -- Dustin Kirkland Wed, 05 May 2010 16:07:39 +0200 + -- Dustin Kirkland Sat, 15 May 2010 15:32:30 -0400 byobu (2.74-0ubuntu1) maverick; urgency=low diff --git a/usr/bin/byobu b/usr/bin/byobu index 50fe67a6..0dd55ebd 100755 --- a/usr/bin/byobu +++ b/usr/bin/byobu @@ -45,8 +45,10 @@ if [ -r "$BYOBU_WINDOWS" ]; then elif [ -r "$HOME/.$PKG/windows.$BYOBU_WINDOWS" ]; then CUSTOM_WINDOW_SET=1 BYOBU_WINDOWS="$HOME/.$PKG/windows.$BYOBU_WINDOWS" -else +elif [ "$#" = "0" ]; then BYOBU_WINDOWS="$HOME/.$PKG/windows" +else + BYOBU_WINDOWS="/dev/null" fi export BYOBU_WINDOWS @@ -62,19 +64,20 @@ if [ -S "$SSH_AUTH_SOCK" ] && [ ! -h "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent" fi +PROFILE="-c /usr/share/$PKG/profiles/byoburc" # Now let's execute screen! if [ "$#" = "0" ]; then out=$(screen -wipe 2>/dev/null) || true if [ "$CUSTOM_WINDOW_SET" = "1" ]; then # Start new custom window set session - exec screen $SCREEN_TERM -c "/usr/share/$PKG/profiles/byoburc" + exec screen $SCREEN_TERM $PROFILE elif echo "$out" | LANG=C egrep -qsi "(No Sockets found in|This room is empty)"; then # Start new default session - exec screen $SCREEN_TERM -c "/usr/share/$PKG/profiles/byoburc" $DEFAULT_WINDOW + exec screen $SCREEN_TERM $PROFILE $DEFAULT_WINDOW else # Select and attach to an existing session exec byobu-select-session fi else - exec screen $SCREEN_TERM -c "$HOME/.$PKG/profile" "$@" + exec screen $SCREEN_TERM $PROFILE "$@" fi