Skip to content
Snippets Groups Projects
Commit fc2282fc authored by Daniel Stonier's avatar Daniel Stonier
Browse files

bugfix for env variable setting when workspaces have spaces, fixes #24

parent d08665d0
Branches
Tags
No related merge requests found
...@@ -6,6 +6,6 @@ SCRIPT=@(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py ...@@ -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 SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py
@[end if]@ @[end if]@
export ROS_MAVEN_PATH=`python ${SCRIPT} --maven-path` export ROS_MAVEN_PATH="`python ${SCRIPT} --maven-path`"
export ROS_MAVEN_DEPLOYMENT_REPOSITORY=`python ${SCRIPT} --maven-deployment-repository` export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`python ${SCRIPT} --maven-deployment-repository`"
export ROS_MAVEN_REPOSITORY=`python ${SCRIPT} --maven-repository` export ROS_MAVEN_REPOSITORY="`python ${SCRIPT} --maven-repository`"
...@@ -6,6 +6,6 @@ SCRIPT=@(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py ...@@ -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 SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py
@[end if]@ @[end if]@
export ROS_MAVEN_PATH=`python ${SCRIPT} --maven-path` export ROS_MAVEN_PATH="`python ${SCRIPT} --maven-path`"
export ROS_MAVEN_DEPLOYMENT_REPOSITORY=`python ${SCRIPT} --maven-deployment-repository` export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`python ${SCRIPT} --maven-deployment-repository`"
export ROS_MAVEN_REPOSITORY=`python ${SCRIPT} --maven-repository` export ROS_MAVEN_REPOSITORY="`python ${SCRIPT} --maven-repository`"
...@@ -24,7 +24,7 @@ def get_workspaces(environ): ...@@ -24,7 +24,7 @@ def get_workspaces(environ):
value = environ[env_name] if env_name in environ else '' value = environ[env_name] if env_name in environ else ''
paths = [path for path in value.split(os.pathsep) if path] paths = [path for path in value.split(os.pathsep) if path]
# remove non-workspace paths # 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 return workspaces
def get_environment_variable(environ, key): def get_environment_variable(environ, key):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment