From 23378b5cf33dd02b4662532e6ef6627a88940788 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Fri, 29 Jul 2022 12:08:10 +0100 Subject: [PATCH] Merge prun commands --- roles/home-cli/files/bashrc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/roles/home-cli/files/bashrc b/roles/home-cli/files/bashrc index 4056ba5..4b1f97a 100644 --- a/roles/home-cli/files/bashrc +++ b/roles/home-cli/files/bashrc @@ -154,14 +154,13 @@ then fi # Useful aliases for Podman. -_podman_cli_args=( +_podman_run_args=( --rm --interactive --tty -) -_podman_desktop_args=( --security-opt label=disable --volume /tmp/.X11-unix/:/tmp/.X11-unix/ + --volume /etc/pki/ca-trust:/etc/pki/ca-trust:ro --env DISPLAY=:0 --volume $XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR --env XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR @@ -169,10 +168,8 @@ _podman_desktop_args=( --env MOZ_ENABLE_WAYLAND=1 --ipc host ) -alias prun="podman run ${_podman_cli_args[@]}" -alias prunw="podman run ${_podman_cli_args[@]} ${_podman_desktop_args[@]}" -unset _podman_desktop_args -unset _podman_cli_args +alias prun="podman run ${_podman_run_args[@]}" +unset _podman_run_args # Desktop files (used by desktop environments within both X11 and Wayland) are # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for