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

usr/bin/byobu: more completely support attaching to an existing ssh

Browse source 
agent on first launch of byobu, LP: #528967
This commit is contained in:
Dustin Kirkland 2010-03-03 12:25:49 -06:00
commit d49917d673
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -6,8 +6,8 @@ byobu (2.60) unreleased; urgency=low
usr/share/byobu/ec2/rates.us_va: LP: #531497 usr/share/byobu/ec2/rates.us_va: LP: #531497
- update ec2 pricing model, allow for local overrides of prices - update ec2 pricing model, allow for local overrides of prices
via a sourced symlink or bespoke file in $HOME/.byobu/ec2_rates via a sourced symlink or bespoke file in $HOME/.byobu/ec2_rates
* usr/bin/byobu: support attaching to an existing ssh agent on first * usr/bin/byobu: more completely support attaching to an existing ssh
launch of byobu, LP: #528967 agent on first launch of byobu, LP: #528967
[ Meethune Bhowmick <meethune@gmail.com> ] [ Meethune Bhowmick <meethune@gmail.com> ]
* rpm/byobu.spec: specfile updated/modernized for current layout, LP: #526233 * rpm/byobu.spec: specfile updated/modernized for current layout, LP: #526233

5
usr/bin/byobu
View file

@ -44,13 +44,14 @@ grep -qs "^[^#]" "$HOME/.$PKG/windows" && DEFAULT_WINDOW= || DEFAULT_WINDOW="mot
# Check if our terminfo supports 256 colors # Check if our terminfo supports 256 colors
[ -x /usr/bin/tput ] && [ $(/usr/bin/tput colors) -eq 256 ] && SCREEN_TERM="-T screen-256color" [ -x /usr/bin/tput ] && [ $(/usr/bin/tput colors) -eq 256 ] && SCREEN_TERM="-T screen-256color"
# Now let's execute screen!
if [ "$#" = "0" ]; then
# Create or update ssh-agent socket # Create or update ssh-agent socket
if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
rm -f "$RUN/$PKG.ssh-agent" rm -f "$RUN/$PKG.ssh-agent"
ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent" ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
fi fi
# Now let's execute screen!
if [ "$#" = "0" ]; then
out=$(screen -wipe 2>/dev/null) || true out=$(screen -wipe 2>/dev/null) || true
if echo "$out" | grep -qsi "^No Sockets found in "; then if echo "$out" | grep -qsi "^No Sockets found in "; then
# Start new session # Start new session