diff --git a/doc/local_ros_installation.md b/doc/local_ros_installation.md index 14cb2d3ac9325e3fb4331e8c7be5119025b9d8a7..f3cfab546e0e7bc802edbe03acf0573a0bf9e4c8 100644 --- a/doc/local_ros_installation.md +++ b/doc/local_ros_installation.md @@ -25,6 +25,10 @@ Get the waraps repo: ```bash git clone git@gitlab.liu.se:lrs/waraps.git ``` +or if you need to specify the key: +```bash +GIT_SSH_COMMAND='ssh -i ~/.ssh/wara_deploy -o IdentitiesOnly=yes' git clone git@gitlab.liu.se:lrs/waraps.git +``` Put the script directory of the waraps repo in your PATH plus add some variables that are needed. For example in .bashrc: diff --git a/script/wrun b/script/wrun index 61902c5f2c11e96a8e9420ae34b4aab891d90ba8..f75c9e17b306213c9c3709da0a09b0d0d64ba69e 100755 --- a/script/wrun +++ b/script/wrun @@ -1,5 +1,7 @@ #!/bin/bash +# -e DISPLAY=unix${DISPLAY}\ + if [[ $(lsb_release -rs) == "18.04" ]]; then docker run \ --network host \ @@ -7,7 +9,7 @@ docker run \ --ipc=host \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -v /tmp:/exttmp \ - -e DISPLAY=unix${DISPLAY}\ + -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel "$@" fi @@ -19,7 +21,7 @@ docker run \ --ipc=host \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -v /tmp:/exttmp \ - -e DISPLAY=unix${DISPLAY}\ + -e DISPLAY=${DISPLAY}\ -e ROS_HOSTNAME=localhost \ --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@" fi