Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Jan 23, 2019
1 parent b6fce3b commit 994e656
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def update_ikfast_package(args):

# Make sure at least all required dependencies are in the depends lists
build_deps = ["liblapack-dev", "moveit_core", "pluginlib", "roscpp", "tf2_kdl", "tf2_eigen", "eigen_conversions", "moveit_ros_planning"]
run_deps = ["liblapack", "moveit_core", "pluginlib", "roscpp", "eigen_conversions", "moveit_ros_planning"]
run_deps = ["liblapack-dev", "moveit_core", "pluginlib", "roscpp", "eigen_conversions", "moveit_ros_planning"]

update_deps(build_deps, "build_depend", package_xml)
update_deps(run_deps, "exec_depend", package_xml)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,10 @@ RUN apt-get update && \
# enforce a specific version of sympy, which is known to work with OpenRave
RUN pip install sympy==0.7.1
EOF
test "$QUIET" == "1" && exec 3>&1 1>/dev/null
test "$QUIET" == "1" && exec 3>&1 1>/dev/null # save stdout as 3, then redirect to /dev/null
docker build -t fixed-openrave $TMP_DIR || exit 1
test "$QUIET" == "1" && exec 1>&3
test "$QUIET" == "1" && exec 1>&3 # restore stdout
echo "Successfully built docker image."
__DOCKER_BUILT=1
}

Expand All @@ -115,9 +116,12 @@ function create_dae_file {
if ! rosrun collada_urdf urdf_to_collada "$INPUT" "$DAE_FILE" 2> /dev/null ; then
# When this failed, run docker
build_docker_image
echo "Converting urdf to Collada"
cp "$INPUT" "$TMP_DIR/robot.urdf"
test "$QUIET" == "1" && exec 3>&2 2>/dev/null # save stderr as 3, then redirect to /dev/null
docker run --rm --user $(id -u):$(id -g) -v $TMP_DIR:/input --workdir /input -e HOME=/input \
fixed-openrave:latest rosrun collada_urdf urdf_to_collada robot.urdf robot.dae
test "$QUIET" == "1" && exec 2>&3 # restore stderr
fi
}

Expand Down

0 comments on commit 994e656

Please sign in to comment.