Merge pull request #692 from ros/zsh_remove_emulate

remove 'emulate sh' from setup.zsh
ros · Oct 22, 2014 · dbb33f1 · dbb33f1
2 parents 23a2aa4 + 1d326d4
commit dbb33f1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cmake/templates/setup.zsh.in b/cmake/templates/setup.zsh.in
@@ -2,7 +2,7 @@
 # generated from catkin/cmake/templates/setup.zsh.in
 
 CATKIN_SHELL=zsh
+
+# source setup.sh from same directory as this file
 _CATKIN_SETUP_DIR=$(builtin cd -q "`dirname "$0"`" > /dev/null && pwd)
-emulate sh # emulate POSIX
-. "$_CATKIN_SETUP_DIR/setup.sh"
-emulate zsh # back to zsh mode
+source "$_CATKIN_SETUP_DIR/setup.sh"