diff --git a/README.md b/README.md index f529f6e..a50d18f 100644 --- a/README.md +++ b/README.md @@ -47,11 +47,19 @@ catkin config --cmake-args -DCMAKE_CXX_STANDARD=14 -DCMAKE_BUILD_TYPE=Release wstool init src ``` -Clone the `tsdf-plusplus` repository (first tries over SSH and falls back to HTTPS): +Clone the `tsdf-plusplus` repository over HTTPS (no Github account required) and automatically fetch dependencies: ```bash cd $CATKIN_WS/src -git clone git@github.com:ethz-asl/tsdf-plusplus.git | git clone https://github.com/ethz-asl/tsdf-plusplus.git -wstool merge -t . tsdf-plusplus/tsdf_plusplus_ssh.rosinstall | wstool merge -t . tsdf-plusplus/tsdf_plusplus_https.rosinstall +git clone https://github.com/ethz-asl/tsdf-plusplus.git +wstool merge -t . tsdf-plusplus/tsdf_plusplus_https.rosinstall +wstool update +``` + +Alternatively, clone over SSH (Github account required): +```bash +cd $CATKIN_WS/src +git clone git@github.com:ethz-asl/tsdf-plusplus.git +wstool merge -t . tsdf-plusplus/tsdf_plusplus_ssh.rosinstall wstool update ``` diff --git a/docker/README.md b/docker/README.md index d62f007..05debc0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -48,18 +48,18 @@ on the docker machine. For example, you can use the following command: ```bash -docker-develop.sh /home//catkin_ws +./docker-develop.sh /home//catkin_ws ``` If you want to run it as a daemon you can use: ```bash -docker-develop.sh /home//catkin_ws dt +./docker-develop.sh /home//catkin_ws dt ``` Once you are in the docker machine you can, for instance, build from sources doing ```bash - catkin build -j$(($(nproc) / 2)) -l1 tsdf_plusplus_ros rgbd_segmentation mask_rcnn_ros cloud_segmentation +catkin build -j$(($(nproc) / 2)) -l1 tsdf_plusplus_ros rgbd_segmentation mask_rcnn_ros cloud_segmentation ``` By doing so, the docker machine will build the sources on your computer and