Merge pull request #884 from wkentaro/update-catkin-shell

[jsk_tools] See CATKIN_SHELL to find shell
jsk-ros-pkg · Apr 27, 2015 · 183f22c · 183f22c
2 parents 1357503 + b47ca89
commit 183f22c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/jsk_tools/env-hooks/99.jsk_tools.sh b/jsk_tools/env-hooks/99.jsk_tools.sh
@@ -42,11 +42,11 @@ _update_prompt() {
         fi
     elif [ "$master_host" != "" ]; then
         local ros_prompt="[$ROS_MASTER_URI][$ROS_IP]"
-        if [ "$(basename $SHELL)" = "sh" ]; then
+        if [ "$CATKIN_SHELL" = "sh" ]; then
             export PS1="$ros_prompt ${WITHOUT_ROS_PROMPT}"
-        elif [ "$(basename $SHELL)" = "bash" ]; then
+        elif [ "$CATKIN_SHELL" = "bash" ]; then
             export PS1="\[\033[00;31m\]$ros_prompt\[\033[00m\] ${WITHOUT_ROS_PROMPT}"
-        elif [ "$(basename $SHELL)" = "zsh" ]; then
+        elif [ "$CATKIN_SHELL" = "zsh" ]; then
             export PS1="%{$fg[red]%}$ros_prompt%{$reset_color%} ${WITHOUT_ROS_PROMPT}"
         fi
     fi