Small fix for zsh; use setopt shwordsplit instead of set -y

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@34804 72102866-910b-0410-8b05-ffd578937521
Ibadinov · Feb 21, 2012 · 4715658 · 4715658
1 parent f9a7d90
commit 4715658
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-21  Nicola Pero  <[email protected]>
+
+	* GNUstep.sh.in: Use "setopt shwordsplit" instead of "set -y" to
+	get zsh to emulate sh's traditional word split behaviour.
+	Suggestion by Alex Merry.
+
 2012-02-21  Nicola Pero  <[email protected]>
 
 	* FilesystemLayouts/README: Updated for the fact that 'fhs' is now

diff --git a/GNUstep.sh.in b/GNUstep.sh.in
@@ -62,7 +62,7 @@ if [ -n "$ZSH_VERSION" ]; then
   # If -y is not already set, set it and remember that we
   # need to set it back to what it was at the end.
   if ( setopt | grep shwordsplit > /dev/null ); then :; else
-    set -y
+    setopt shwordsplit
     GS_ZSH_NEED_TO_RESTORE_SET=yes
   fi
 
@@ -666,6 +666,6 @@ else
 fi
 
 if [ -n "$GS_ZSH_NEED_TO_RESTORE_SET" ]; then
-  set +y
+  unsetopt shwordsplit
 fi
 # EOF