From 2f91240766f835dce4f7e65443e7257232ef1ef8 Mon Sep 17 00:00:00 2001 From: lunardunno <126363523+lunardunno@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:00:14 +0400 Subject: [PATCH] printf aliases --- client/server_scripts/build_container.sh | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/client/server_scripts/build_container.sh b/client/server_scripts/build_container.sh index a7087898..445d5169 100644 --- a/client/server_scripts/build_container.sh +++ b/client/server_scripts/build_container.sh @@ -1,25 +1,25 @@ 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;\ + 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;\ + 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";\ + 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 "printf '%s\n' ' # 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' >> /var/cache/containers/short-name-aliases.conf";\ fi;\ fi;\ sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER