From 7bf16406f55f3183db91c0b473794e741d00fef6 Mon Sep 17 00:00:00 2001
From: lunardunno <126363523+lunardunno@users.noreply.github.com>
Date: Wed, 19 Mar 2025 03:09:58 +0400
Subject: [PATCH] Minor changes

Minor changes
---
 client/core/errorstrings.cpp             |  2 +-
 client/server_scripts/build_container.sh |  9 +++++----
 client/server_scripts/install_docker.sh  | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/core/errorstrings.cpp b/client/core/errorstrings.cpp
index 840a647a..7cbadbad 100644
--- a/client/core/errorstrings.cpp
+++ b/client/core/errorstrings.cpp
@@ -26,7 +26,7 @@ QString errorString(ErrorCode code) {
     case(ErrorCode::ServerUserDirectoryNotAccessible): errorMessage = QObject::tr("The server user's home directory is not accessible"); break;
     case(ErrorCode::ServerUserNotAllowedInSudoers): errorMessage = QObject::tr("Action not allowed in sudoers"); break;
     case(ErrorCode::ServerUserPasswordRequired): errorMessage = QObject::tr("The user's password is required"); break;
-    case(ErrorCode::ServerDockerNotSupported): errorMessage = QObject::tr("Docker, which is offered for installation by default by the server's OS, is not supported"); break;
+    case(ErrorCode::ServerDockerNotSupported): errorMessage = QObject::tr("Docker for installation by default is not supported"); break;
     case(ErrorCode::ServerDockerStatusNotActive): errorMessage = QObject::tr("Docker service status is not active"); break;
 
     // Libssh errors
diff --git a/client/server_scripts/build_container.sh b/client/server_scripts/build_container.sh
index c8e6b527..482d9997 100644
--- a/client/server_scripts/build_container.sh
+++ b/client/server_scripts/build_container.sh
@@ -4,13 +4,14 @@ if [ -n "$(sudo docker --version 2>/dev/null | grep podman)" ]; then sudo sh -c
   grep -q '\[aliases\]' /var/cache/containers/short-name-aliases.conf || echo '[aliases]' >> /var/cache/containers/short-name-aliases.conf;\
   grep -q '  # Amnezia start' /var/cache/containers/short-name-aliases.conf || 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/amneziawg-go\" = \"docker.io/amneziavpn/amneziawg-go\"' \
+    '  \"amneziavpn/amnezia-wg\" = \"docker.io/amneziavpn/amnezia-wg\"' \
+    '  \"amneziavpn/euphoria\" = \"docker.io/amneziavpn/euphoria\"' \
     '  \"amneziavpn/torpress\" = \"docker.io/amneziavpn/torpress\"' \
-    '  \"atmoz/sftp\" = \"docker.io/atmoz/sftp\"' \
     '  \"mvance/unbound\" = \"docker.io/mvance/unbound\"' \
+    '  \"3proxy/3proxy\" = \"docker.io/3proxy/3proxy\"' \
+    '  \"atmoz/sftp\" = \"docker.io/atmoz/sftp\"' \
     '  \"alpine\" = \"docker.io/library/alpine\"' \
     '  # Amnezia finish' \
     >> /var/cache/containers/short-name-aliases.conf";\
diff --git a/client/server_scripts/install_docker.sh b/client/server_scripts/install_docker.sh
index 50125125..5b88e340 100644
--- a/client/server_scripts/install_docker.sh
+++ b/client/server_scripts/install_docker.sh
@@ -11,22 +11,22 @@ if ! command -v fuser > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $sil
 if ! command -v lsof > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst lsof; fi;\
 if ! command -v docker > /dev/null 2>&1; then \
   sudo $pm $check_pkgs;\
-  if [ -n "$(sudo $pm $wh_pkg $docker_pkg 2>/dev/null | grep moby-engine)" ]; \
+  if [ -n "$(sudo $pm $wh_pkg $docker_pkg 2>/dev/null | grep moby-engine)" ];\
   then echo "Docker is not supported"; exit 1;\
   else sudo $pm $silent_inst $docker_pkg;\
   fi;\
-  if [ -n "$(sudo docker --version 2>/dev/null | grep podman)" ]; then docker_pkg="podman-docker"; check_srv="podman.socket podman";\
+  if [ -n "$(sudo docker --version 2>/dev/null | grep podman)" ]; then check_srv="podman.socket podman"; docker_pkg="podman-docker";\
     if [ -n "$(sudo docker --version 2>&1 | grep /etc/containers/nodocker)" ]; then sudo touch /etc/containers/nodocker; fi;\
   fi;\
   sleep 5; sudo systemctl enable --now $check_srv 2>/dev/null; sleep 5;\
 fi;\
-if [ -n "$(sudo docker --version 2>&1 | grep moby-engine)" ]; then echo "Docker is not supported"; exit 1;\
-elif [ -n "$(sudo docker --version 2>&1 | grep podman)" ]; then check_srv="podman.socket podman"; docker_pkg="podman-docker";\
-  if [ -n "$(sudo docker --version 2>&1 | grep /etc/containers/nodocker)" ]; then sudo touch /etc/containers/nodocker; fi;\
-fi;\
 if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = "Y" ]; then \
   if ! command -v apparmor_parser > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst apparmor; fi;\
 fi;\
+if [ -n "$(sudo docker --version 2>&1 | grep moby-engine)" ]; then echo "Docker is not supported"; exit 1;\
+elif [ -n "$(sudo docker --version 2>/dev/null | grep podman)" ]; then check_srv="podman.socket podman"; docker_pkg="podman-docker";\
+  if [ -n "$(sudo docker --version 2>&1 | grep /etc/containers/nodocker)" ]; then sudo touch /etc/containers/nodocker; fi;\
+fi;\
 if [ "$(systemctl is-active $check_srv | head -n1)" != "active" ]; then \
   sudo $pm $check_pkgs; sudo $pm $silent_inst $docker_pkg;\
   sleep 5; sudo systemctl start $check_srv; sleep 5;\