From 8d20981228d63e4bbd8f3be7e03961a9216c97fa Mon Sep 17 00:00:00 2001 From: AngeD Date: Thu, 20 Jul 2023 22:30:48 +0200 Subject: [PATCH] fix: remove unused repitest + style --- bin/containers/debian | 2 +- bin/containers/epitest | 9 +++------ bin/containers/gui | 6 +++--- bin/containers/lutris | 2 +- bin/containers/minecraft | 6 +++--- bin/containers/repitest | 3 --- bin/containers/torbrowser | 6 +++--- 7 files changed, 14 insertions(+), 20 deletions(-) delete mode 100755 bin/containers/repitest diff --git a/bin/containers/debian b/bin/containers/debian index 09ef134..f885776 100755 --- a/bin/containers/debian +++ b/bin/containers/debian @@ -2,4 +2,4 @@ CRI=(podman) -${CRI[@]} run --rm -it -v "$PWD:/mnt" -w /mnt debian:12-slim +"${CRI[@]}" run --rm -it -v "$PWD:/mnt/" -w /mnt/ debian:12-slim diff --git a/bin/containers/epitest b/bin/containers/epitest index facff5f..53401aa 100755 --- a/bin/containers/epitest +++ b/bin/containers/epitest @@ -1,16 +1,13 @@ #!/bin/bash -e -# shellcheck disable=SC2034 -DBUS_SESSION_BUS_ADDRESS= # https://wiki.archlinux.org/title/Podman#Permission_denied:_OCI_permission_denied CRI=(podman) -IMG=docker.io/epitechcontent/epitest-docker +IMG='docker.io/epitechcontent/epitest-docker' TAG=latest if ! "${CRI[@]}" container start epitest > /dev/null 2>&1; then - "${CRI[@]}" run --rm -d \ - --name epitest \ - -v "$HOME:$HOME" \ + "${CRI[@]}" run --rm -d --name epitest \ + -v "$HOME:$HOME" \ "$IMG:$TAG" sleep infinity > /dev/null fi diff --git a/bin/containers/gui b/bin/containers/gui index 9e91f9a..d923352 100755 --- a/bin/containers/gui +++ b/bin/containers/gui @@ -2,14 +2,14 @@ CRI=(podman) -${CRI[@]} run --rm --name minecraft \ +"${CRI[@]}" run --rm --name gui \ --device /dev/dri/ \ -e DISPLAY \ -e XDG_RUNTIME_DIR \ - -v /dev/shm:/dev/shm \ + -v /dev/shm/:/dev/shm/ \ -v /tmp/.X11-unix/:/tmp/.X11-unix/ \ -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ - -v "home:/app/" \ + -v home:/app/ \ -it \ git.maby.dev/ange/docker-gui:0.1 \ bash diff --git a/bin/containers/lutris b/bin/containers/lutris index 23ad247..af34f9c 100755 --- a/bin/containers/lutris +++ b/bin/containers/lutris @@ -2,7 +2,7 @@ CRI=(podman) -mkdir -p "$HOME/Games/lutris/" +mkdir -p "$HOME/GUI/lutris/" "${CRI[@]}" run --rm --name lutris \ --userns=keep-id \ diff --git a/bin/containers/minecraft b/bin/containers/minecraft index 962a5c4..e69a86a 100755 --- a/bin/containers/minecraft +++ b/bin/containers/minecraft @@ -2,14 +2,14 @@ CRI=(podman) -mkdir -p "$HOME/Games/minecraft/" +mkdir -p "$HOME/GUI/minecraft/" -${CRI[@]} run --rm --name minecraft \ +"${CRI[@]}" run --rm --name minecraft \ --userns=keep-id \ --device /dev/dri/ \ -e DISPLAY \ -e XDG_RUNTIME_DIR \ - -v /dev/shm:/dev/shm \ + -v /dev/shm/:/dev/shm/ \ -v /tmp/.X11-unix/:/tmp/.X11-unix/ \ -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ -v "$HOME/Games/minecraft/:/app/" \ diff --git a/bin/containers/repitest b/bin/containers/repitest deleted file mode 100755 index 2b40947..0000000 --- a/bin/containers/repitest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -sudo docker run -it --rm -v "$PWD:/usr/app/" docker.io/epitechcontent/epitest-docker bash "$@" diff --git a/bin/containers/torbrowser b/bin/containers/torbrowser index 873d826..40762fb 100755 --- a/bin/containers/torbrowser +++ b/bin/containers/torbrowser @@ -2,14 +2,14 @@ CRI=(podman) -mkdir -p "/tmp/torbrowser/" +mkdir -p /tmp/torbrowser/ -${CRI[@]} run --rm --name torbrowser \ +"${CRI[@]}" run --rm --name torbrowser \ --userns=keep-id \ --device /dev/dri/ \ -e DISPLAY \ -e XDG_RUNTIME_DIR \ - -v /dev/shm:/dev/shm \ + -v /dev/shm/:/dev/shm/ \ -v /tmp/.X11-unix/:/tmp/.X11-unix/ \ -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ -v "/tmp/torbrowser/:/app/" \