diff --git a/client/server_scripts/install_docker.sh b/client/server_scripts/install_docker.sh index 225ca2b3f..c19b853f2 100644 --- a/client/server_scripts/install_docker.sh +++ b/client/server_scripts/install_docker.sh @@ -5,13 +5,9 @@ elif which pacman > /dev/null 2>&1; then pm=$(which pacman); silent_inst="-S --n else echo "Packet manager not found"; exit 1; fi;\ echo "Dist: $dist, Packet manager: $pm, Install command: $silent_inst, Check pkgs command: $check_pkgs, What pkg command: $what_pkg, Docker pkg: $docker_pkg";\ if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\ -if [ "$(echo $LANG)" != "en_US.UTF-8" ] || [ "$(echo $LANG)" != "C.UTF-8" ]; then \ - CHECK_LOCALES=$(locale -a | grep -c 'en_US.utf8');\ - if [ "$CHECK_LOCALES" != "0" ]; then export LC_ALL=en_US.UTF-8;\ - else \ - CHECK_LOCALES=$(locale -a | grep 'C.utf8');\ - if [ "$CHECK_LOCALES" != "0" ]; then export LC_ALL=C.UTF-8; fi;\ - fi;\ +if [ "$(echo $LANG)" != "en_US.UTF-8" ] && [ "$(echo $LANG)" != "C.UTF-8" ]; then \ + if [ "$(locale -a | grep -c 'en_US.utf8')" != "0" ]; then export LC_ALL=en_US.UTF-8;\ + else export LC_ALL=C.UTF-8; fi;\ fi;\ if ! command -v sudo > /dev/null 2>&1; then $pm $check_pkgs; $pm $silent_inst sudo;\ if ! command -v sudo > /dev/null 2>&1; then sudo; exit 1; fi;\ @@ -25,7 +21,7 @@ fi;\ if ! command -v docker > /dev/null 2>&1; then sudo $pm $check_pkgs;\ check_podman=$(sudo $pm $what_pkg $docker_pkg 2>&1 | grep -c podman-docker);\ check_moby=$(sudo $pm $what_pkg $docker_pkg 2>&1 | grep -c moby-engine);\ - if [ "$check_podman" != "0" ] || [ "$check_moby" != "0" ]; then echo "Container is not supported"; exit 1;\ + if [ "$check_podman" != "0" ] || [ "$check_moby" != "0" ]; then echo "Docker is not supported"; docker; exit 1;\ else sudo $pm $silent_inst $docker_pkg;\ if ! command -v docker > /dev/null 2>&1; then docker; exit 1;\ else sleep 5; sudo systemctl enable --now docker; sleep 5; fi;\ @@ -34,6 +30,6 @@ fi;\ if [ "$(systemctl is-active docker)" != "active" ]; then \ sudo $pm $check_pkgs; sudo $pm $silent_inst $docker_pkg;\ sleep 5; sudo systemctl start docker; sleep 5;\ + if [ "$(systemctl is-active docker)" != "active" ]; then echo "Failed to status docker, command not found"; fi;\ fi;\ -if ! command -v docker > /dev/null 2>&1; then echo "Failed to install docker, command not found"; exit 1; fi;\ docker --version