From 05134783ab06934a5d26a61863623dbefea31b41 Mon Sep 17 00:00:00 2001 From: Daniel Stonier <d.stonier@gmail.com> Date: Wed, 3 Jun 2015 10:54:07 +0900 Subject: [PATCH] bugfix for env variable setting when workspaces have spaces, fixes #24 --- env-hooks/15.rosjava.bash.em | 6 +++--- env-hooks/15.rosjava.sh.em | 6 +++--- generate_environment_variables.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/env-hooks/15.rosjava.bash.em b/env-hooks/15.rosjava.bash.em index 5edcc4b..9da9f00 100644 --- a/env-hooks/15.rosjava.bash.em +++ b/env-hooks/15.rosjava.bash.em @@ -6,6 +6,6 @@ SCRIPT=@(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py @[end if]@ -export ROS_MAVEN_PATH=`python ${SCRIPT} --maven-path` -export ROS_MAVEN_DEPLOYMENT_REPOSITORY=`python ${SCRIPT} --maven-deployment-repository` -export ROS_MAVEN_REPOSITORY=`python ${SCRIPT} --maven-repository` +export ROS_MAVEN_PATH="`python ${SCRIPT} --maven-path`" +export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`python ${SCRIPT} --maven-deployment-repository`" +export ROS_MAVEN_REPOSITORY="`python ${SCRIPT} --maven-repository`" diff --git a/env-hooks/15.rosjava.sh.em b/env-hooks/15.rosjava.sh.em index 62cc858..36f796e 100644 --- a/env-hooks/15.rosjava.sh.em +++ b/env-hooks/15.rosjava.sh.em @@ -6,6 +6,6 @@ SCRIPT=@(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py @[end if]@ -export ROS_MAVEN_PATH=`python ${SCRIPT} --maven-path` -export ROS_MAVEN_DEPLOYMENT_REPOSITORY=`python ${SCRIPT} --maven-deployment-repository` -export ROS_MAVEN_REPOSITORY=`python ${SCRIPT} --maven-repository` +export ROS_MAVEN_PATH="`python ${SCRIPT} --maven-path`" +export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`python ${SCRIPT} --maven-deployment-repository`" +export ROS_MAVEN_REPOSITORY="`python ${SCRIPT} --maven-repository`" diff --git a/generate_environment_variables.py b/generate_environment_variables.py index af7a3f9..5d8f4ce 100755 --- a/generate_environment_variables.py +++ b/generate_environment_variables.py @@ -24,7 +24,7 @@ def get_workspaces(environ): value = environ[env_name] if env_name in environ else '' paths = [path for path in value.split(os.pathsep) if path] # remove non-workspace paths - workspaces = [path for path in paths if os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))] + workspaces = [path.replace(' ', '\ ') for path in paths if os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))] return workspaces def get_environment_variable(environ, key): -- GitLab