* usr/bin/byobu-reconnect-sockets: LP: #923169

- better fix for zsh, set compatibility options instead
This commit is contained in:
Dustin Kirkland 2012-01-31 15:06:49 -06:00
commit f8759012b9
2 changed files with 10 additions and 2 deletions

4
debian/changelog vendored
View file

@ -4,6 +4,10 @@ byobu (5.8) unreleased; urgency=low
* debian/rules:
- autoconf into debian rules
[ Daniel Hahler ]
* usr/bin/byobu-reconnect-sockets: LP: #923169
- better fix for zsh, set compatibility options instead
-- Dustin Kirkland <kirkland@ubuntu.com> Mon, 30 Jan 2012 18:12:49 -0600
byobu (5.7-0ubuntu1) precise; urgency=low

View file

@ -57,8 +57,10 @@ export_and_send () {
screen_update () {
# Ensure that screen's environment variables/values get propagated here
# Enable word splitting for zsh:
[ "x$ZSH_VERSION" != x ] && setopt local_options sh_word_split
tempfile=$(mktemp -q) && {
for var in $(echo $VARS_TO_UPDATE); do
for var in $VARS_TO_UPDATE; do
screen sh -c "echo export $var=\$$var >> \"$tempfile\""
done
. "$tempfile"
@ -68,7 +70,9 @@ screen_update () {
tmux_update () {
# Ensure that tmux's environment variables/values get propagated here
for var in $(echo $VARS_TO_UPDATE); do
# Enable word splitting for zsh:
[ "x$ZSH_VERSION" != x ] && setopt local_options sh_word_split
for var in $VARS_TO_UPDATE; do
expr="$(tmux showenv | grep "^$var=")"
if [ -n "$expr" ]; then
export "$expr"