From 73ee927088e5f1d34a6dd056ce686841e3e24399 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 25 May 2022 09:53:25 +0200 Subject: [PATCH] (bug) unable to run scripts on systemts with legacy version of docker-compose --- CHANGELOG.md | 2 ++ scripts/pg-analyzers.sh | 4 ++-- scripts/run.sh | 4 ++-- setup/setup.sh | 4 ++-- setup/upgrade.sh | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f49c963e..22550ed3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## next deploy +- Fix a bug: unable to run scripts on systemts with legacy version of docker-compose + ## v5.4.1 2022 May 23 - Disable to clicking outside or pressing escape to close sign up modal diff --git a/scripts/pg-analyzers.sh b/scripts/pg-analyzers.sh index 3d2861859..7cfc7bcd1 100755 --- a/scripts/pg-analyzers.sh +++ b/scripts/pg-analyzers.sh @@ -4,11 +4,11 @@ docker-compose() { if ! docker compose version 1>/dev/null 2>/dev/null then - if ! \docker-compose version 1>/dev/null 2>/dev/null + if ! command docker-compose version 1>/dev/null 2>/dev/null then echo -e "\e[91m[ ❌ ] docker-compose was not found, exiting...\e[39m" && exit 1 else - \docker-compose "$@" + command docker-compose "$@" fi else docker compose "$@" diff --git a/scripts/run.sh b/scripts/run.sh index 09e49c9ce..2d145b91c 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -12,11 +12,11 @@ docker-compose() { if ! docker compose version 1>/dev/null 2>/dev/null then - if ! \docker-compose version 1>/dev/null 2>/dev/null + if ! command docker-compose version 1>/dev/null 2>/dev/null then echo -e "\e[91m[ ❌ ] docker-compose was not found, exiting...\e[39m" && exit 1 else - \docker-compose "$@" + command docker-compose "$@" fi else docker compose "$@" diff --git a/setup/setup.sh b/setup/setup.sh index 226ed8536..bae810904 100755 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -63,11 +63,11 @@ docker-compose() { if ! docker compose version 1>/dev/null 2>/dev/null then - if ! \docker-compose version 1>/dev/null 2>/dev/null + if ! command docker-compose version 1>/dev/null 2>/dev/null then echo -e "\e[91m[ ❌ ] docker-compose was not found, exiting...\e[39m" && exit 1 else - \docker-compose "$@" + command docker-compose "$@" fi else docker compose "$@" diff --git a/setup/upgrade.sh b/setup/upgrade.sh index f3e48e451..fbabdab62 100644 --- a/setup/upgrade.sh +++ b/setup/upgrade.sh @@ -47,11 +47,11 @@ docker-compose() { if ! docker compose version 1>/dev/null 2>/dev/null then - if ! \docker-compose version 1>/dev/null 2>/dev/null + if ! command docker-compose version 1>/dev/null 2>/dev/null then echo -e "\e[91m[ ❌ ] docker-compose was not found, exiting...\e[39m" && exit 1 else - \docker-compose "$@" + command docker-compose "$@" fi else docker compose "$@"