7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Compose] move then in if statement

Browse Source
This commit is contained in:
FreddleSpl0it
2022-06-07 13:59:59 +02:00
parent 7bcc8bd3a2
commit 08d0f9448e
4 changed files with 62 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
generate_config.sh
View File

@@ -30,22 +30,19 @@ for bin in openssl curl docker git awk sha1sum; do
done
echo "checking docker compose version...";
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"
sleep 3
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"
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"
exit 1
>&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"
exit 1
fi
if [ -f mailcow.conf ]; then