From 309f3667f03bc64756ccec297a2e9d276af61ad2 Mon Sep 17 00:00:00 2001 From: Maksim Derbasov Date: Sat, 14 Dec 2024 02:15:37 +0900 Subject: [PATCH] Iteration Signed-off-by: Maksim Derbasov --- docker/run.bash | 13 +++++++++++-- docker/scripts/install_common_deps.sh | 4 ---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docker/run.bash b/docker/run.bash index 7d36a02be8..e6e68937bd 100755 --- a/docker/run.bash +++ b/docker/run.bash @@ -18,8 +18,17 @@ ARGS=("$@") # This is necessary so Gazebo can create a context for OpenGL rendering # (even headless). XAUTH=/tmp/.docker.xauth -xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge - -chmod 777 $XAUTH +if [ ! -f $XAUTH ] +then + xauth_list=$(xauth nlist $DISPLAY | sed -e 's/^..../ffff/') + if [ ! -z "$xauth_list" ] + then + echo $xauth_list | xauth -f $XAUTH nmerge - + else + touch $XAUTH + fi + chmod a+r $XAUTH +fi docker run -it \ -e DISPLAY \ diff --git a/docker/scripts/install_common_deps.sh b/docker/scripts/install_common_deps.sh index e5fd13ae68..4310e0d046 100755 --- a/docker/scripts/install_common_deps.sh +++ b/docker/scripts/install_common_deps.sh @@ -25,9 +25,5 @@ sudo apt-get install --no-install-recommends -y \ clang-tidy \ python3-yaml -sudo apt-get install --no-install-recommends -y \ - libbenchmark-dev \ - libbenchmark1.8.3 - sudo apt-get clean sudo rm -rf /var/lib/apt/lists/*