From 336dcad9355ac2fd487fd28b9e065e4b9182fe4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Kvarnstr=C3=B6m?= <jonas.kvarnstrom@liu.se> Date: Tue, 13 Apr 2021 14:35:14 +0200 Subject: [PATCH] else: echo unsupported operating system --- script/werun | 7 +++++-- script/wgrun | 6 ++++-- script/wpull | 6 ++++-- script/wrun | 6 ++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/script/werun b/script/werun index ea5ff0c..4e45c16 100755 --- a/script/werun +++ b/script/werun @@ -15,9 +15,9 @@ docker run --gpus all \ -e __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G1 \ -e __GLX_VENDOR_LIBRARY_NAME=nvidia \ --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@" -fi -if [[ $(lsb_release -rs) == "20.04" ]]; then + +elif [[ $(lsb_release -rs) == "20.04" ]]; then docker run --gpus all \ --network host \ --security-opt apparmor:unconfined \ @@ -30,4 +30,7 @@ docker run --gpus all \ -e __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G1 \ -e __GLX_VENDOR_LIBRARY_NAME=nvidia \ --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@" + +else + echo "Unsupported operating system" fi diff --git a/script/wgrun b/script/wgrun index 537dfc5..4cc9758 100755 --- a/script/wgrun +++ b/script/wgrun @@ -11,9 +11,8 @@ docker run --gpus all \ -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@" -fi -if [[ $(lsb_release -rs) == "20.04" ]]; then +elif [[ $(lsb_release -rs) == "20.04" ]]; then docker run --gpus all \ --network host \ --security-opt apparmor:unconfined \ @@ -24,4 +23,7 @@ docker run --gpus all \ -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@" + +else + echo "Unsupported operating system" fi diff --git a/script/wpull b/script/wpull index 295abb1..dac1787 100755 --- a/script/wpull +++ b/script/wpull @@ -3,11 +3,13 @@ if [[ $(lsb_release -rs) == "18.04" ]]; then echo "Pulling gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel" docker pull gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel -fi -if [[ $(lsb_release -rs) == "20.04" ]]; then +elif [[ $(lsb_release -rs) == "20.04" ]]; then echo "Pulling gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel" docker pull gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel + +else + echo "Unsupported operating system" fi diff --git a/script/wrun b/script/wrun index 59927f4..f0c3518 100755 --- a/script/wrun +++ b/script/wrun @@ -10,9 +10,8 @@ docker run \ -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@" -fi -if [[ $(lsb_release -rs) == "20.04" ]]; then +elif [[ $(lsb_release -rs) == "20.04" ]]; then docker run \ --network host \ --ulimit nofile=1024 \ @@ -22,4 +21,7 @@ docker run \ -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@" + +else + echo "Unsupported operating system" fi -- GitLab