Skip to content

Commit

Permalink
reset CATKIN_SHELL in devel space generated env.sh files, second loca…
Browse files Browse the repository at this point in the history
…tion (#655)
  • Loading branch information
dirk-thomas committed Jun 15, 2014
1 parent 1474f72 commit cf32d59
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions cmake/templates/env.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ if [ $# -eq 0 ] ; then
exit 1
fi

# ensure to not use different shell type which was set before
CATKIN_SHELL=sh

# source @[email protected] from same directory as this file
_CATKIN_SETUP_DIR=$(cd "`dirname "$0"`" > /dev/null && pwd)
. "$_CATKIN_SETUP_DIR/@[email protected]"
Expand Down

0 comments on commit cf32d59

Please sign in to comment.