From 958112af6b96f0f794a986eac91c4038c0d378a1 Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Tue, 7 Jun 2022 14:07:35 +0200 Subject: [PATCH] [Compose] Remove >&2 in if block --- generate_config.sh | 18 ++++++------- helper-scripts/_cold-standby.sh | 38 ++++++++++++++-------------- helper-scripts/backup_and_restore.sh | 18 ++++++------- update.sh | 18 ++++++------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index 66c9203ac..0b01b8033 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -30,18 +30,18 @@ for bin in openssl curl docker git awk sha1sum; do done echo "checking docker compose version..."; -if docker --help | grep compose then +if docker --help | grep compose; then echo '' -elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1 then - >&2 echo -e "\e[31mWARN: Your machine is using Docker-Compose v1!\e[0m" - >&2 echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" - >&2 echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2.\e[0m" - >&2 echo - >&2 echo - >&2 echo -e "\e[33mContinuing...\e[0m" +elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then + echo -e "\e[31mWARN: Your machine is using Docker-Compose v1!\e[0m" + echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" + echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2.\e[0m" + echo + echo + echo -e "\e[33mContinuing...\e[0m" sleep 3 else - >&2 echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m" + echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m" exit 1 fi diff --git a/helper-scripts/_cold-standby.sh b/helper-scripts/_cold-standby.sh index 2ec857acf..a1e2f165c 100755 --- a/helper-scripts/_cold-standby.sh +++ b/helper-scripts/_cold-standby.sh @@ -86,23 +86,23 @@ function preflight_local_checks() { echo "checking docker compose version..."; - if docker --help | grep compose then + if docker --help | grep compose; then echo '' - elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1 then - >&2 echo -e "\e[31mWARN: Your machine is using Docker-Compose v1!\e[0m" - >&2 echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" - >&2 echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2.\e[0m" - >&2 echo - >&2 echo - >&2 echo -e "\e[33mContinuing...\e[0m" + elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then + echo -e "\e[31mWARN: Your machine is using Docker-Compose v1!\e[0m" + echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" + echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2.\e[0m" + echo + echo + echo -e "\e[33mContinuing...\e[0m" sleep 3 else - >&2 echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m" + echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m" exit 1 fi if grep --help 2>&1 | head -n 1 | grep -q -i "busybox"; then - >&2 echo -e "\e[31mBusyBox grep detected on local system, please install GNU grep\e[0m" + echo -e "\e[31mBusyBox grep detected on local system, please install GNU grep\e[0m" exit 1 fi } @@ -144,23 +144,23 @@ function preflight_remote_checks() { -i "${REMOTE_SSH_KEY}" \ ${REMOTE_SSH_HOST} \ -p ${REMOTE_SSH_PORT} \ - -t docker --help | grep compose then + -t docker --help | grep compose; then COMPOSE_COMMAND="docker compose" elif ssh -q -o StrictHostKeyChecking=no \ -i "${REMOTE_SSH_KEY}" \ ${REMOTE_SSH_HOST} \ -p ${REMOTE_SSH_PORT} \ - 'docker-compose version --short' | grep -m1 "^1" > /dev/null 2>&1 then - >&2 echo -e "\e[31mWARN: The remote is using Docker-Compose v1!\e[0m" - >&2 echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" - >&2 echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2 on remote.\e[0m" - >&2 echo - >&2 echo - >&2 echo -e "\e[33mContinuing...\e[0m" + 'docker-compose version --short' | grep -m1 "^1" > /dev/null 2>&1; then + echo -e "\e[31mWARN: The remote is using Docker-Compose v1!\e[0m" + echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" + echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2 on remote.\e[0m" + echo + echo + echo -e "\e[33mContinuing...\e[0m" sleep 3 COMPOSE_COMMAND="docker-compose" else - >&2 echo -e "\e[31mCannot find Docker-Compose v1 or v2 on the Remote Machine! Please install Docker-Compose v2 on that and re-run the script.\e[0m" + echo -e "\e[31mCannot find Docker-Compose v1 or v2 on the Remote Machine! Please install Docker-Compose v2 on that and re-run the script.\e[0m" exit 1 fi } diff --git a/helper-scripts/backup_and_restore.sh b/helper-scripts/backup_and_restore.sh index f0cd5c18c..dd0c22123 100755 --- a/helper-scripts/backup_and_restore.sh +++ b/helper-scripts/backup_and_restore.sh @@ -77,19 +77,19 @@ else fi echo "checking docker compose version..."; -if docker --help | grep compose then +if docker --help | grep compose; then COMPOSE_COMMAND="docker compose" -elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1 then - >&2 echo -e "\e[31mWARN: Your machine is using Docker-Compose v1!\e[0m" - >&2 echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" - >&2 echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2.\e[0m" - >&2 echo - >&2 echo - >&2 echo -e "\e[33mContinuing...\e[0m" +elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then + echo -e "\e[31mWARN: Your machine is using Docker-Compose v1!\e[0m" + echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" + echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2.\e[0m" + echo + echo + echo -e "\e[33mContinuing...\e[0m" sleep 3 COMPOSE_COMMAND="docker-compose" else - >&2 echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m" + echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m" exit 1 fi diff --git a/update.sh b/update.sh index d7c65b773..f23999ae4 100755 --- a/update.sh +++ b/update.sh @@ -46,19 +46,19 @@ done echo "checking docker compose version..."; -if docker --help | grep compose then +if docker --help | grep compose; then COMPOSE_COMMAND="docker compose" -elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1 then - >&2 echo -e "\e[31mWARN: Your machine is using Docker-Compose v1!\e[0m" - >&2 echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" - >&2 echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2.\e[0m" - >&2 echo - >&2 echo - >&2 echo -e "\e[33mContinuing...\e[0m" +elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then + echo -e "\e[31mWARN: Your machine is using Docker-Compose v1!\e[0m" + echo -e "\e[31mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m" + echo -e "\e[31mPlease consider a upgrade to Docker-Compose v2.\e[0m" + echo + echo + echo -e "\e[33mContinuing...\e[0m" sleep 3 COMPOSE_COMMAND="docker-compose" else - >&2 echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m" + echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m" exit 1 fi export LC_ALL=C