* usr/bin/byobu.in: LP: #1369783

- respect user's custom default-command and/or default-shell
    in the first window launched
This commit is contained in:
Dustin Kirkland 2015-08-31 10:29:21 -05:00
commit c43b286e58
2 changed files with 9 additions and 1 deletions

3
debian/changelog vendored
View file

@ -20,6 +20,9 @@ byobu (5.95) unreleased; urgency=medium
--follow-symlinks when possible (not always available)
* usr/lib/byobu/logo:
- fix minor logic typo (reversed logic)
* usr/bin/byobu.in: LP: #1369783
- respect user's custom default-command and/or default-shell
in the first window launched
[ Fortunato Ventre ]
* usr/lib/byobu/include/constants:

View file

@ -118,7 +118,12 @@ case $BYOBU_BACKEND in
fi
fi
BYOBU_PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc"
DEFAULT_WINDOW="new-session -n $BYOBU_WINDOW_NAME ${BYOBU_PREFIX}/bin/byobu-shell"
# Set default window, unless user has overriden
if egrep -qs "default-command|default-shell" $HOME/.$PKG/.tmux.conf >/dev/null 2>&1; then
DEFAULT_WINDOW=
else
DEFAULT_WINDOW="new-session -n $BYOBU_WINDOW_NAME ${BYOBU_PREFIX}/bin/byobu-shell"
fi
sessions=$($BYOBU_BACKEND list-sessions 2>/dev/null) || true
CUSTOM_WINDOW_SET=0
if [ -s "$BYOBU_CONFIG_DIR/windows.tmux.$BYOBU_WINDOWS" ]; then