From 886ca3f6ac97f58dd50a07c368dfcf64b2dc7cea Mon Sep 17 00:00:00 2001 From: lunardunno <126363523+lunardunno@users.noreply.github.com> Date: Mon, 1 Jul 2024 13:55:18 +0400 Subject: [PATCH] test2 --- .../server_scripts/remove_all_containers.sh | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/client/server_scripts/remove_all_containers.sh b/client/server_scripts/remove_all_containers.sh index 5aa97030..2161838c 100644 --- a/client/server_scripts/remove_all_containers.sh +++ b/client/server_scripts/remove_all_containers.sh @@ -6,27 +6,16 @@ sudo rm -frd /opt/amnezia;\ if [ -n "$(sudo docker --version 2>/dev/null | grep 'podman')" ]; then \ sudo sed -i '/^ # Amnezia start/,/^ # Amnezia finish$/d' /var/cache/containers/short-name-aliases.conf;\ fi;\ -if [ -n "$(sudo docker --version 2>/dev/null | grep podman)" ]; then \ - if ! sudo test -d "/var/cache/containers"; then \ - sudo mkdir -m 700 -p /var/cache/containers; fi;\ - if ! sudo test -f "/var/cache/containers/short-name-aliases.conf"; then \ - sudo touch /var/cache/containers/short-name-aliases.conf;\ - sudo chmod 600 /var/cache/containers/short-name-aliases.conf; fi;\ - if ! sudo grep -q "\[aliases\]" /var/cache/containers/short-name-aliases.conf; then \ - sudo sh -c "echo \"[aliases]\" >> /var/cache/containers/short-name-aliases.conf"; fi;\ - if ! sudo grep -q " \# Amnezia start" /var/cache/containers/short-name-aliases.conf; then \ - sudo sh -c "cat >> /var/cache/containers/short-name-aliases.conf \ -<< EOF - # Amnezia start - \"3proxy/3proxy\" = \"docker.io/3proxy/3proxy\" - \"amneziavpn/amnezia-wg\" = \"docker.io/amneziavpn/amnezia-wg\" - \"amneziavpn/amneziawg-go\" = \"docker.io/amneziavpn/amneziawg-go\" - \"amneziavpn/ipsec-server\" = \"docker.io/amneziavpn/ipsec-server\" - \"amneziavpn/torpress\" = \"docker.io/amneziavpn/torpress\" - \"atmoz/sftp\" = \"docker.io/atmoz/sftp\" - \"mvance/unbound\" = \"docker.io/mvance/unbound\" - \"alpine\" = \"docker.io/library/alpine\" - # Amnezia finish -EOF";\ - fi;\ +sudo cat >> /var/cache/containers/short-name-aliases.conf << EOF +# Amnezia start +"3proxy/3proxy" = "docker.io/3proxy/3proxy" +"amneziavpn/amnezia-wg" = "docker.io/amneziavpn/amnezia-wg" +"amneziavpn/amneziawg-go" = "docker.io/amneziavpn/amneziawg-go" +"amneziavpn/ipsec-server" = "docker.io/amneziavpn/ipsec-server" +"amneziavpn/torpress" = "docker.io/amneziavpn/torpress" +"atmoz/sftp" = "docker.io/atmoz/sftp" +"mvance/unbound" = "docker.io/mvance/unbound" +"alpine" = "docker.io/library/alpine" +# Amnezia finish +EOF fi