From 4948c9c6167ea83ff4ceee4f36aef71d802e8a69 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <bzr@thequod.de>
Date: Tue, 31 Jan 2012 13:07:58 +0100
Subject: [PATCH] Fix byobu-reconnect-sockets for zsh by setting sh_word_split
 locally.

---
 usr/bin/byobu-reconnect-sockets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/bin/byobu-reconnect-sockets b/usr/bin/byobu-reconnect-sockets
index eb332a34..d32d263e 100755
--- a/usr/bin/byobu-reconnect-sockets
+++ b/usr/bin/byobu-reconnect-sockets
@@ -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"