github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 22:34:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

usr/bin/byobu: ensure that .screenrc gets sourced if byobu is run

Browse source 
with arguments, LP: #580760
This commit is contained in:
Dustin Kirkland 2010-05-15 15:34:43 -04:00
commit 5b97f97e24
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
debian/changelog vendored
View file

@ -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 <kirkland@ubuntu.com> Wed, 05 May 2010 16:07:39 +0200 -- Dustin Kirkland <kirkland@ubuntu.com> Sat, 15 May 2010 15:32:30 -0400
byobu (2.74-0ubuntu1) maverick; urgency=low byobu (2.74-0ubuntu1) maverick; urgency=low

11
usr/bin/byobu
View file

@ -45,8 +45,10 @@ if [ -r "$BYOBU_WINDOWS" ]; then
elif [ -r "$HOME/.$PKG/windows.$BYOBU_WINDOWS" ]; then elif [ -r "$HOME/.$PKG/windows.$BYOBU_WINDOWS" ]; then
CUSTOM_WINDOW_SET=1 CUSTOM_WINDOW_SET=1
BYOBU_WINDOWS="$HOME/.$PKG/windows.$BYOBU_WINDOWS" BYOBU_WINDOWS="$HOME/.$PKG/windows.$BYOBU_WINDOWS"
else elif [ "$#" = "0" ]; then
BYOBU_WINDOWS="$HOME/.$PKG/windows" BYOBU_WINDOWS="$HOME/.$PKG/windows"
else
BYOBU_WINDOWS="/dev/null"
fi fi
export BYOBU_WINDOWS 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" ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
fi fi
PROFILE="-c /usr/share/$PKG/profiles/byoburc"
# Now let's execute screen! # Now let's execute screen!
if [ "$#" = "0" ]; then if [ "$#" = "0" ]; then
out=$(screen -wipe 2>/dev/null) || true out=$(screen -wipe 2>/dev/null) || true
if [ "$CUSTOM_WINDOW_SET" = "1" ]; then if [ "$CUSTOM_WINDOW_SET" = "1" ]; then
# Start new custom window set session # 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 elif echo "$out" | LANG=C egrep -qsi "(No Sockets found in|This room is empty)"; then
# Start new default session # Start new default session
exec screen $SCREEN_TERM -c "/usr/share/$PKG/profiles/byoburc" $DEFAULT_WINDOW exec screen $SCREEN_TERM $PROFILE $DEFAULT_WINDOW
else else
# Select and attach to an existing session # Select and attach to an existing session
exec byobu-select-session exec byobu-select-session
fi fi
else else
exec screen $SCREEN_TERM -c "$HOME/.$PKG/profile" "$@" exec screen $SCREEN_TERM $PROFILE "$@"
fi fi