From 18b0fdc05e2d2d4b61ff16422c63d265c6e54b30 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Thu, 26 May 2011 10:36:05 -0500
Subject: [PATCH] * usr/lib/byobu/custom, usr/share/byobu/keybindings/f-keys:  
 - fix regression in custom scripts   - get ctrl-F5 working correctly again

---
 debian/changelog                   | 4 +++-
 usr/lib/byobu/custom               | 5 ++---
 usr/share/byobu/keybindings/f-keys | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25824c67..83222c83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 byobu (4.5) unreleased; urgency=low
 
-  * UNRELEASED
+  * usr/lib/byobu/custom, usr/share/byobu/keybindings/f-keys:
+    - fix regression in custom scripts
+    - get ctrl-F5 working correctly again
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 25 May 2011 19:37:18 -0500
 
diff --git a/usr/lib/byobu/custom b/usr/lib/byobu/custom
index 638d3309..42c50a9d 100755
--- a/usr/lib/byobu/custom
+++ b/usr/lib/byobu/custom
@@ -30,11 +30,10 @@ CACHE="$DIR/$PKG.custom"
 # Loop over custom scripts
 for i in "$DATA/bin/"[0-9]*_*; do
 	[ -x "$i" ] || continue
-	script=${script##*/}
+	script=${i##*/}
 	freq=${script%%_*}
 	freq=${freq#0}
-	[ -r "$CACHE.$script.last" ] && read lastrun "$CACHE.$script.last" ||
-		lastrun=0
+	[ -r "$CACHE.$script.last" ] && read lastrun < "$CACHE.$script.last" || lastrun=0
 	expiration=$(($lastrun+$freq))
 	if [ $NOW -ge $expiration ]; then
 		"$i" "$@" > "$CACHE.$script" 2>/dev/null
diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys
index 54d28854..a2ea56a2 100644
--- a/usr/share/byobu/keybindings/f-keys
+++ b/usr/share/byobu/keybindings/f-keys
@@ -69,7 +69,7 @@ register n "^[[6~"
 bindkey "^[[6;3~" eval 'msgwait 0' 'msgminwait 0' 'copy' 'process n'		# alt-pagedn | scrollback
 
 # Make socket reconnection a little easier
-bindkey "^[[15;5~" eval 'process r' 'stuff ". $BYOBU_PREFIX/bin/byobu-reconnect-sockets^M"' # ctrl-F5 | reconnect gpg/ssh sockets
+bindkey "^[[15;5~" eval 'process x' 'process r' 'stuff ". $BYOBU_PREFIX/bin/byobu-reconnect-sockets^M"' # ctrl-F5 | reconnect gpg/ssh/x sockets
 
 # Detach from an auto-launched byobu, but don't log out of the shell
 bindkey "^[[17;2~" eval 'exec touch /var/run/screen/S-$USER/byobu.no-logout' 'detach'   # ctrl-F6 | detach, but don't logout