* usr/lib/byobu/custom, usr/share/byobu/keybindings/f-keys:

- fix regression in custom scripts
  - get ctrl-F5 working correctly again
This commit is contained in:
Dustin Kirkland 2011-05-26 10:36:05 -05:00
commit 18b0fdc05e
3 changed files with 6 additions and 5 deletions

4
debian/changelog vendored
View file

@ -1,6 +1,8 @@
byobu (4.5) unreleased; urgency=low 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 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 25 May 2011 19:37:18 -0500

View file

@ -30,11 +30,10 @@ CACHE="$DIR/$PKG.custom"
# Loop over custom scripts # Loop over custom scripts
for i in "$DATA/bin/"[0-9]*_*; do for i in "$DATA/bin/"[0-9]*_*; do
[ -x "$i" ] || continue [ -x "$i" ] || continue
script=${script##*/} script=${i##*/}
freq=${script%%_*} freq=${script%%_*}
freq=${freq#0} freq=${freq#0}
[ -r "$CACHE.$script.last" ] && read lastrun "$CACHE.$script.last" || [ -r "$CACHE.$script.last" ] && read lastrun < "$CACHE.$script.last" || lastrun=0
lastrun=0
expiration=$(($lastrun+$freq)) expiration=$(($lastrun+$freq))
if [ $NOW -ge $expiration ]; then if [ $NOW -ge $expiration ]; then
"$i" "$@" > "$CACHE.$script" 2>/dev/null "$i" "$@" > "$CACHE.$script" 2>/dev/null

View file

@ -69,7 +69,7 @@ register n "^[[6~"
bindkey "^[[6;3~" eval 'msgwait 0' 'msgminwait 0' 'copy' 'process n' # alt-pagedn | scrollback bindkey "^[[6;3~" eval 'msgwait 0' 'msgminwait 0' 'copy' 'process n' # alt-pagedn | scrollback
# Make socket reconnection a little easier # 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 # 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 bindkey "^[[17;2~" eval 'exec touch /var/run/screen/S-$USER/byobu.no-logout' 'detach' # ctrl-F6 | detach, but don't logout