Genericized a little.

Author: rickarmstrong

jetbrains_ros/ros_env.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 # NOTE: you shouldn't call this script, you should source it. This script
-# assumes that you've created a Catkin worspace somewhere that points back
-# to this ROS package.
+# assumes that this directory is in the top-level dir of a working Catkin workspace.
 
 . ${HOME}/.bashrc
 
@@ -12,14 +11,13 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" > /dev/null
 IFS='/' read -r -a tokens <<< `find /opt/ros -name env.sh`
 DISTRO=${tokens[3]}
 
-# Setup the base ROS environment.
+# Source the base ROS environment.
 . /opt/ros/${DISTRO}/setup.bash
 
-# Load this project's environment.
-CATKIN_WS=../../cmd_vel_filter_ws
-. ${CATKIN_WS}/devel/setup.bash
+# Load this workspace's environment.
+. ../devel/setup.bash
 
-# Activate our virtualenv.
-. ~/venv/cmd_vel_filter/bin/activate
+# Uncomment this if you want to activate a virtualenv.
+# . ~/venv/cmd_vel_filter/bin/activate
 
 export ROS_MASTER_URI=http://127.0.0.1:11311

jetbrains_ros/start_clion.sh

@@ -2,5 +2,5 @@
 # Activate the ROS environment for our project, then kick off clion.
 
 # EDIT THIS: set to your installation
-CLION_DIR=clion
-source ros_env.sh && /opt/${CLION_DIR}/bin/clion.sh &
+CLION_PATH=/opt/clion
+source ros_env.sh && ${CLION_PATH}/bin/clion.sh &

jetbrains_ros/start_pycharm.sh

@@ -2,5 +2,5 @@
 # Activate the ROS environment for our project, then kick off pycharm.
 
 # EDIT THIS: set to your installation
-PYCHARM_DIR=pycharm
-source ros_env.sh && /opt/${PYCHARM_DIR}/bin/pycharm.sh &
+PYCHARM_PATH=/opt/pycharm
+source ros_env.sh && ${PYCHARM_PATH}/bin/pycharm.sh &