From 74d901f7fa1c8866ab556a96c9238e83ab6c833a Mon Sep 17 00:00:00 2001 From: Brett Higgins Date: Wed, 5 Mar 2025 15:02:47 -0500 Subject: [PATCH] Formatting tweaks --- install.sh | 3 +++ install/check-minimum-requirements.sh | 4 ++-- install/dc-detect-version.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 23726ce97f..b14ca083c6 100755 --- a/install.sh +++ b/install.sh @@ -19,6 +19,9 @@ trap_with_arg cleanup ERR INT TERM EXIT source install/check-latest-commit.sh source install/check-minimum-requirements.sh +echo "BAILING OUT EARLY" +exit 0 + # Let's go! Start impacting things. # Upgrading clickhouse needs to come first before turning things off, since we need the old clickhouse image # in order to determine whether or not the clickhouse version needs to be upgraded. diff --git a/install/check-minimum-requirements.sh b/install/check-minimum-requirements.sh index effa266b62..e2d1506615 100644 --- a/install/check-minimum-requirements.sh +++ b/install/check-minimum-requirements.sh @@ -21,13 +21,13 @@ fi echo "Found Docker Compose version $COMPOSE_VERSION" CPU_AVAILABLE_IN_DOCKER=$(docker run --rm busybox nproc --all) -if [[ "$CPU_AVAILABLE_IN_DOCKER" -lt "$MIN_CPU_HARD" ]]; then +if [[ "$CPU_AVAILABLE_IN_DOCKER" -lt "$MIN_CPU_HARD" ]] ; then echo "FAIL: Required minimum CPU cores available to Docker is $MIN_CPU_HARD, found $CPU_AVAILABLE_IN_DOCKER" exit 1 fi RAM_AVAILABLE_IN_DOCKER=$(docker run --rm busybox free -m 2>/dev/null | awk '/Mem/ {print $2}') -if [[ "$RAM_AVAILABLE_IN_DOCKER" -lt "$MIN_RAM_HARD" ]]; then +if [[ "$RAM_AVAILABLE_IN_DOCKER" -lt "$MIN_RAM_HARD" ]] ; then echo "FAIL: Required minimum RAM available to Docker is $MIN_RAM_HARD MB, found $RAM_AVAILABLE_IN_DOCKER MB" exit 1 fi diff --git a/install/dc-detect-version.sh b/install/dc-detect-version.sh index 2bb624b3cc..4b4ad79e54 100644 --- a/install/dc-detect-version.sh +++ b/install/dc-detect-version.sh @@ -21,7 +21,7 @@ if [[ -z "$COMPOSE_VERSION" && -z "$STANDALONE_COMPOSE_VERSION" ]]; then fi if [[ ! -z "${STANDALONE_COMPOSE_VERSION}" ]]; then - if ! vergte ${COMPOSE_VERSION//v/} ${STANDALONE_COMPOSE_VERSION//v/} ; then + if ! vergte ${COMPOSE_VERSION//v/} ${STANDALONE_COMPOSE_VERSION//v/}; then COMPOSE_VERSION="${STANDALONE_COMPOSE_VERSION}" dc_base="$dc_base_standalone" fi