From 1a3bfbf4ed4041e6973038bd328d569746a59a1b Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@x200>
Date: Wed, 3 Mar 2010 12:00:09 -0600
Subject: [PATCH] usr/bin/byobu: support attaching to an existing ssh agent on
 first launch of byobu, LP: #528967

---
 debian/changelog |  2 ++
 usr/bin/byobu    | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57ec07f9..bbbe9d57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ byobu (2.60) unreleased; urgency=low
     usr/share/byobu/ec2/rates.us_va: LP: #531497
     - update ec2 pricing model, allow for local overrides of prices
       via a sourced symlink or bespoke file in $HOME/.byobu/ec2_rates
+  * usr/bin/byobu: support attaching to an existing ssh agent on first
+    launch of byobu, LP: #528967
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 26 Feb 2010 10:43:00 -0600
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index d3edf2bd..90df069a 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -46,17 +46,17 @@ grep -qs "^[^#]" "$HOME/.$PKG/windows" && DEFAULT_WINDOW= || DEFAULT_WINDOW="mot
 
 # Now let's execute screen!
 if [ "$#" = "0" ]; then
+	# Create or update ssh-agent socket
+	if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
+		rm -f "$RUN/$PKG.ssh-agent"
+		ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
+	fi
 	out=$(screen -wipe 2>/dev/null) || true
 	if echo "$out" | grep -qsi "^No Sockets found in "; then
 		# Start new session
 		exec screen $SCREEN_TERM -c "/usr/share/$PKG/profiles/byoburc" -t shell $DEFAULT_WINDOW
 	else
 		# Select and attach to an existing session
-		# Update ssh-agent socket
-		if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then 
-			rm -f "$RUN/$PKG.ssh-agent"
-			ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
-		fi
 		exec byobu-select-session
 	fi
 else