Skip to content

Commit 4035798

Browse files
authored
Merge pull request #13 from RoboStack/ros2-ros-etc-dir
2 parents 40ebb84 + 8046412 commit 4035798

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

vinca/templates/activate.bat.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
@@call "%CONDA_PREFIX%\Library\local_setup.bat"
1111
@@set PYTHONHOME=
1212
@@set "ROS_OS_OVERRIDE=robostack:win64"
13-
13+
@@set "ROS_ETC_DIR=%CONDA_PREFIX%\Library\etc\ros"
14+
@@set "AMENT_PREFIX_PATH=%CONDA_PREFIX%\Library"

vinca/templates/activate.sh.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by vinca http://github.com/seanyen/vinca.
1+
# Generated by vinca http://github.com/RoboStack/vinca.
22
# DO NOT EDIT!
33
# if [ -z "${CONDA_PREFIX}" ]; then
44
# exit 0;
@@ -19,5 +19,8 @@ case "$OSTYPE" in
1919
linux*) export ROS_OS_OVERRIDE="robostack:linux";;
2020
esac
2121

22+
export ROS_ETC_DIR=$CONDA_PREFIX/etc/ros
23+
export AMENT_PREFIX_PATH=$CONDA_PREFIX
24+
2225
# Looks unnecessary for UNIX
2326
# unset PYTHONHOME=

vinca/templates/build_catkin.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by vinca http://github.com/seanyen/vinca.
1+
# Generated by vinca http://github.com/RoboStack/vinca.
22
# DO NOT EDIT!
33

44
CATKIN_BUILD_BINARY_PACKAGE="ON"

vinca/templates/deactivate.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by vinca http://github.com/seanyen/vinca.
1+
# Generated by vinca http://github.com/RoboStack/vinca.
22
# DO NOT EDIT!
33
if [ -z "${CONDA_PREFIX}" ]; then
44
exit 0

0 commit comments

Comments
 (0)