From 6ae953a7e13c23389db8b37de62c55e62ef1b15f Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Sun, 31 Mar 2013 20:24:30 +0200 Subject: [PATCH 1/2] zsh: make color_map and attr_map more robust zsh allows to defile "global aliases" which may appear anywhere on the command line. The most prominent example is: alias -g 'L'=" | less " This allows command lines such as "bzr log L". In order to avoid such global aliases to be expanded in this user-sourced utility file, the key need to be quoted. --- usr/lib/byobu/include/shutil | 50 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/usr/lib/byobu/include/shutil b/usr/lib/byobu/include/shutil index 73e84b16..5aa9ca69 100755 --- a/usr/lib/byobu/include/shutil +++ b/usr/lib/byobu/include/shutil @@ -52,37 +52,37 @@ color_screen() { color_map() { case "$1" in - k) _RET="black" ;; - r) _RET="red" ;; - g) _RET="green" ;; - y) _RET="yellow" ;; - b) _RET="blue" ;; - m) _RET="magenta" ;; - c) _RET="cyan" ;; - w) _RET="white" ;; - d) _RET="color0" ;; - K) _RET="#555555" ;; - R) _RET="#FF0000" ;; - G) _RET="#00FF00" ;; - Y) _RET="#FFFF00" ;; - B) _RET="#0000FF" ;; - M) _RET="#FF00FF" ;; - C) _RET="#00FFFF" ;; - W) _RET="#FFFFFF" ;; + "k") _RET="black" ;; + "r") _RET="red" ;; + "g") _RET="green" ;; + "y") _RET="yellow" ;; + "b") _RET="blue" ;; + "m") _RET="magenta" ;; + "c") _RET="cyan" ;; + "w") _RET="white" ;; + "d") _RET="color0" ;; + "K") _RET="#555555" ;; + "R") _RET="#FF0000" ;; + "G") _RET="#00FF00" ;; + "Y") _RET="#FFFF00" ;; + "B") _RET="#0000FF" ;; + "M") _RET="#FF00FF" ;; + "C") _RET="#00FFFF" ;; + "W") _RET="#FFFFFF" ;; *) _RET= ;; esac } attr_map() { case "$1" in - d) _RET=,dim ;; - u) _RET=,underscore ;; - b) _RET=,bold ;; - r) _RET=,reverse ;; - s) _RET=,standout ;; - B) _RET=,blinking ;; - h) _RET=,hidden ;; - i) _RET=,italics ;; + "d") _RET=,dim ;; + "u") _RET=,underscore ;; + "b") _RET=,bold ;; + "r") _RET=,reverse ;; + "s") _RET=,standout ;; + "B") _RET=,blinking ;; + "h") _RET=,hidden ;; + "i") _RET=,italics ;; *) _RET= ;; esac } From 6f8cfbe3c8df452aae628af0451e957e94643a9c Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Sun, 31 Mar 2013 20:28:42 +0200 Subject: [PATCH 2/2] byobu-reconnect-sockets: quote shell expansions this avoids error messages in zsh --- usr/bin/byobu-reconnect-sockets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/bin/byobu-reconnect-sockets b/usr/bin/byobu-reconnect-sockets index 048b6ac5..9d909fd3 100755 --- a/usr/bin/byobu-reconnect-sockets +++ b/usr/bin/byobu-reconnect-sockets @@ -93,7 +93,7 @@ case $BYOBU_BACKEND in esac # Establish gpg-agent socket, helps when reconnecting to a detached session -newest "$HOME/.gnupg/"gpg-agent-info-* && . "$_RET" && export_and_send GPG_AGENT_INFO +newest "$HOME/.gnupg/gpg-agent-info-*" && . "$_RET" && export_and_send GPG_AGENT_INFO # Reconnect dbus, source the most recently touched session-bus # Sorry, ls -t is needed here, to sort by time