From bc9c3b59e2e0434f01f21a087c348b177a504778 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 11:13:13 +1000 Subject: [PATCH 01/11] [#2351] Added per-step timing to 'task()' and 'pass()' functions. --- scripts/custom/provision-20-migration.sh | 4 ++-- scripts/vortex/deploy-artifact.sh | 4 ++-- scripts/vortex/deploy-container-registry.sh | 4 ++-- scripts/vortex/deploy-lagoon.sh | 4 ++-- scripts/vortex/deploy-webhook.sh | 4 ++-- scripts/vortex/deploy.sh | 4 ++-- scripts/vortex/doctor.sh | 4 ++-- scripts/vortex/download-db-acquia.sh | 4 ++-- scripts/vortex/download-db-container-registry.sh | 4 ++-- scripts/vortex/download-db-ftp.sh | 4 ++-- scripts/vortex/download-db-lagoon.sh | 4 ++-- scripts/vortex/download-db-s3.sh | 4 ++-- scripts/vortex/download-db-url.sh | 4 ++-- scripts/vortex/download-db.sh | 4 ++-- scripts/vortex/export-db-file.sh | 4 ++-- scripts/vortex/export-db-image.sh | 4 ++-- scripts/vortex/export-db.sh | 4 ++-- scripts/vortex/info.sh | 4 ++-- scripts/vortex/login-container-registry.sh | 4 ++-- scripts/vortex/login.sh | 4 ++-- scripts/vortex/logout.sh | 4 ++-- scripts/vortex/notify-email.sh | 4 ++-- scripts/vortex/notify-github.sh | 4 ++-- scripts/vortex/notify-jira.sh | 4 ++-- scripts/vortex/notify-newrelic.sh | 4 ++-- scripts/vortex/notify-slack.sh | 4 ++-- scripts/vortex/notify-webhook.sh | 4 ++-- scripts/vortex/notify.sh | 4 ++-- scripts/vortex/provision-sanitize-db.sh | 4 ++-- scripts/vortex/provision.sh | 4 ++-- scripts/vortex/reset.sh | 4 ++-- scripts/vortex/setup-ssh.sh | 4 ++-- scripts/vortex/task-copy-db-acquia.sh | 4 ++-- scripts/vortex/task-copy-files-acquia.sh | 4 ++-- scripts/vortex/task-custom-lagoon.sh | 4 ++-- scripts/vortex/task-purge-cache-acquia.sh | 4 ++-- scripts/vortex/update-vortex.sh | 4 ++-- scripts/vortex/upload-db-s3.sh | 4 ++-- 38 files changed, 76 insertions(+), 76 deletions(-) diff --git a/scripts/custom/provision-20-migration.sh b/scripts/custom/provision-20-migration.sh index fa75d7649..45e85b391 100755 --- a/scripts/custom/provision-20-migration.sh +++ b/scripts/custom/provision-20-migration.sh @@ -41,9 +41,9 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/deploy-artifact.sh b/scripts/vortex/deploy-artifact.sh index 6a61d4ea1..a22fea3e8 100755 --- a/scripts/vortex/deploy-artifact.sh +++ b/scripts/vortex/deploy-artifact.sh @@ -61,9 +61,9 @@ VORTEX_DEPLOY_ARTIFACT_GIT_ARTIFACT_SHA256="${VORTEX_DEPLOY_ARTIFACT_GIT_ARTIFAC # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/deploy-container-registry.sh b/scripts/vortex/deploy-container-registry.sh index 4eb5dbae8..d4f6fd91d 100755 --- a/scripts/vortex/deploy-container-registry.sh +++ b/scripts/vortex/deploy-container-registry.sh @@ -36,9 +36,9 @@ VORTEX_DEPLOY_CONTAINER_REGISTRY_PASS="${VORTEX_DEPLOY_CONTAINER_REGISTRY_PASS:- # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/deploy-lagoon.sh b/scripts/vortex/deploy-lagoon.sh index 5dd883a09..d8b54b89a 100755 --- a/scripts/vortex/deploy-lagoon.sh +++ b/scripts/vortex/deploy-lagoon.sh @@ -82,9 +82,9 @@ VORTEX_DEPLOY_LAGOON_FAIL_ENV_LIMIT_EXCEEDED="${VORTEX_DEPLOY_LAGOON_FAIL_ENV_LI # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # Check if error output contains Lagoon environment limit exceeded message. diff --git a/scripts/vortex/deploy-webhook.sh b/scripts/vortex/deploy-webhook.sh index 75360d45f..905ee104b 100755 --- a/scripts/vortex/deploy-webhook.sh +++ b/scripts/vortex/deploy-webhook.sh @@ -24,9 +24,9 @@ VORTEX_DEPLOY_WEBHOOK_RESPONSE_STATUS="${VORTEX_DEPLOY_WEBHOOK_RESPONSE_STATUS:- # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/deploy.sh b/scripts/vortex/deploy.sh index 1427a7d44..a80395701 100755 --- a/scripts/vortex/deploy.sh +++ b/scripts/vortex/deploy.sh @@ -53,9 +53,9 @@ VORTEX_DEPLOY_ALLOW_SKIP="${VORTEX_DEPLOY_ALLOW_SKIP:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/doctor.sh b/scripts/vortex/doctor.sh index 7934d57ba..b7dae5a22 100755 --- a/scripts/vortex/doctor.sh +++ b/scripts/vortex/doctor.sh @@ -66,9 +66,9 @@ VORTEX_SSH_FILE="${VORTEX_SSH_FILE:-${HOME}/.ssh/id_rsa}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } warn() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[33m[WARN] %s\033[0m\n" "${1}" || printf "[WARN] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-acquia.sh b/scripts/vortex/download-db-acquia.sh index 5a65c3b67..8b7967850 100755 --- a/scripts/vortex/download-db-acquia.sh +++ b/scripts/vortex/download-db-acquia.sh @@ -77,9 +77,9 @@ VORTEX_DOWNLOAD_DB_ACQUIA_BACKUP_MAX_WAIT="${!_v:-600}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-container-registry.sh b/scripts/vortex/download-db-container-registry.sh index 963337c84..3e6cf1d24 100755 --- a/scripts/vortex/download-db-container-registry.sh +++ b/scripts/vortex/download-db-container-registry.sh @@ -49,9 +49,9 @@ VORTEX_DOWNLOAD_DB_CONTAINER_REGISTRY_IMAGE_BASE="${!_v:-${!_vs:-}}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-ftp.sh b/scripts/vortex/download-db-ftp.sh index f4a69278d..3a2fd833f 100755 --- a/scripts/vortex/download-db-ftp.sh +++ b/scripts/vortex/download-db-ftp.sh @@ -51,9 +51,9 @@ VORTEX_DOWNLOAD_DB_FTP_DB_FILE="${!_v:-${!_vs:-${!_vss:-db.sql}}}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-lagoon.sh b/scripts/vortex/download-db-lagoon.sh index 30f40d5b3..4128023e3 100755 --- a/scripts/vortex/download-db-lagoon.sh +++ b/scripts/vortex/download-db-lagoon.sh @@ -91,9 +91,9 @@ WEBROOT="${WEBROOT:-web}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-s3.sh b/scripts/vortex/download-db-s3.sh index 79f69716a..4fe2cfacc 100755 --- a/scripts/vortex/download-db-s3.sh +++ b/scripts/vortex/download-db-s3.sh @@ -53,9 +53,9 @@ VORTEX_DOWNLOAD_DB_S3_DB_FILE="${!_v:-${!_vs:-${!_vss:-db.sql}}}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-url.sh b/scripts/vortex/download-db-url.sh index 8f49cfd43..8b91c209d 100755 --- a/scripts/vortex/download-db-url.sh +++ b/scripts/vortex/download-db-url.sh @@ -40,9 +40,9 @@ VORTEX_DOWNLOAD_DB_UNZIP_PASSWORD="${!_v:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db.sh b/scripts/vortex/download-db.sh index e402bdf4e..ab0a4eff3 100755 --- a/scripts/vortex/download-db.sh +++ b/scripts/vortex/download-db.sh @@ -46,9 +46,9 @@ VORTEX_DOWNLOAD_DB_DIR="${!_v:-${!_vs:-./.data}}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/export-db-file.sh b/scripts/vortex/export-db-file.sh index c00bd59f2..0c19d6e33 100755 --- a/scripts/vortex/export-db-file.sh +++ b/scripts/vortex/export-db-file.sh @@ -16,9 +16,9 @@ VORTEX_EXPORT_DB_FILE_DIR="${VORTEX_EXPORT_DB_FILE_DIR:-${VORTEX_DB_DIR:-./.data # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/export-db-image.sh b/scripts/vortex/export-db-image.sh index 727b029f9..a04e659a1 100755 --- a/scripts/vortex/export-db-image.sh +++ b/scripts/vortex/export-db-image.sh @@ -30,9 +30,9 @@ VORTEX_EXPORT_DB_IMAGE_DIR="${VORTEX_EXPORT_DB_IMAGE_DIR:-${VORTEX_DB_DIR}}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/export-db.sh b/scripts/vortex/export-db.sh index d5b467270..28781069a 100755 --- a/scripts/vortex/export-db.sh +++ b/scripts/vortex/export-db.sh @@ -22,9 +22,9 @@ VORTEX_EXPORT_DB_IMAGE="${VORTEX_EXPORT_DB_IMAGE:-${VORTEX_DB_IMAGE:-}}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/info.sh b/scripts/vortex/info.sh index 8b1e9a6f0..00b79af33 100755 --- a/scripts/vortex/info.sh +++ b/scripts/vortex/info.sh @@ -19,9 +19,9 @@ VORTEX_SHOW_LOGIN="${VORTEX_SHOW_LOGIN:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/login-container-registry.sh b/scripts/vortex/login-container-registry.sh index f320c066b..d2504f94a 100755 --- a/scripts/vortex/login-container-registry.sh +++ b/scripts/vortex/login-container-registry.sh @@ -38,9 +38,9 @@ VORTEX_LOGIN_CONTAINER_REGISTRY_DOCKER_CONFIG="${VORTEX_LOGIN_CONTAINER_REGISTRY # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/login.sh b/scripts/vortex/login.sh index 4332d605a..7458c6b8c 100755 --- a/scripts/vortex/login.sh +++ b/scripts/vortex/login.sh @@ -16,9 +16,9 @@ VORTEX_LOGIN_UNBLOCK_ADMIN="${VORTEX_LOGIN_UNBLOCK_ADMIN:-${VORTEX_UNBLOCK_ADMIN # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/logout.sh b/scripts/vortex/logout.sh index fb7eb6ec3..9c1480072 100755 --- a/scripts/vortex/logout.sh +++ b/scripts/vortex/logout.sh @@ -16,9 +16,9 @@ VORTEX_LOGOUT_BLOCK_ADMIN="${VORTEX_LOGOUT_BLOCK_ADMIN:-${VORTEX_UNBLOCK_ADMIN:- # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-email.sh b/scripts/vortex/notify-email.sh index 7abe90fd5..913354bae 100755 --- a/scripts/vortex/notify-email.sh +++ b/scripts/vortex/notify-email.sh @@ -59,9 +59,9 @@ VORTEX_NOTIFY_EMAIL_BRANCHES="${VORTEX_NOTIFY_EMAIL_BRANCHES:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-github.sh b/scripts/vortex/notify-github.sh index 9d39c9e9e..8d5560590 100755 --- a/scripts/vortex/notify-github.sh +++ b/scripts/vortex/notify-github.sh @@ -50,9 +50,9 @@ VORTEX_NOTIFY_GITHUB_BRANCHES="${VORTEX_NOTIFY_GITHUB_BRANCHES:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-jira.sh b/scripts/vortex/notify-jira.sh index 0a513c79e..6d00ef80b 100755 --- a/scripts/vortex/notify-jira.sh +++ b/scripts/vortex/notify-jira.sh @@ -70,9 +70,9 @@ VORTEX_NOTIFY_JIRA_BRANCHES="${VORTEX_NOTIFY_JIRA_BRANCHES:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-newrelic.sh b/scripts/vortex/notify-newrelic.sh index 8499b06e7..ba5aec159 100755 --- a/scripts/vortex/notify-newrelic.sh +++ b/scripts/vortex/notify-newrelic.sh @@ -81,9 +81,9 @@ VORTEX_NOTIFY_NEWRELIC_BRANCHES="${VORTEX_NOTIFY_NEWRELIC_BRANCHES:-main,master, # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-slack.sh b/scripts/vortex/notify-slack.sh index 197e8a890..cc40e0c01 100755 --- a/scripts/vortex/notify-slack.sh +++ b/scripts/vortex/notify-slack.sh @@ -56,9 +56,9 @@ VORTEX_NOTIFY_SLACK_BRANCHES="${VORTEX_NOTIFY_SLACK_BRANCHES:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-webhook.sh b/scripts/vortex/notify-webhook.sh index 192b3eb5c..869ed6123 100755 --- a/scripts/vortex/notify-webhook.sh +++ b/scripts/vortex/notify-webhook.sh @@ -53,9 +53,9 @@ VORTEX_NOTIFY_WEBHOOK_BRANCHES="${VORTEX_NOTIFY_WEBHOOK_BRANCHES:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify.sh b/scripts/vortex/notify.sh index cce0ceefa..f37fbb424 100755 --- a/scripts/vortex/notify.sh +++ b/scripts/vortex/notify.sh @@ -49,9 +49,9 @@ VORTEX_NOTIFY_LOGIN_URL="${VORTEX_NOTIFY_LOGIN_URL:-}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/provision-sanitize-db.sh b/scripts/vortex/provision-sanitize-db.sh index b352e71fd..7bb6ecee0 100755 --- a/scripts/vortex/provision-sanitize-db.sh +++ b/scripts/vortex/provision-sanitize-db.sh @@ -28,9 +28,9 @@ VORTEX_PROVISION_SANITIZE_DB_ADDITIONAL_FILE="${VORTEX_PROVISION_SANITIZE_DB_ADD # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/provision.sh b/scripts/vortex/provision.sh index 48ba61098..6bd3c679c 100755 --- a/scripts/vortex/provision.sh +++ b/scripts/vortex/provision.sh @@ -85,9 +85,9 @@ VORTEX_PROVISION_DB_IMAGE="${VORTEX_PROVISION_DB_IMAGE:-${VORTEX_DB_IMAGE:-}}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/reset.sh b/scripts/vortex/reset.sh index 6679b1574..de2554933 100755 --- a/scripts/vortex/reset.sh +++ b/scripts/vortex/reset.sh @@ -13,9 +13,9 @@ set -eu # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/setup-ssh.sh b/scripts/vortex/setup-ssh.sh index 3b1fc6b29..02112c19b 100755 --- a/scripts/vortex/setup-ssh.sh +++ b/scripts/vortex/setup-ssh.sh @@ -35,9 +35,9 @@ VORTEX_SSH_DISABLE_STRICT_HOST_KEY_CHECKING="${VORTEX_SSH_DISABLE_STRICT_HOST_KE # @formatter:off debg() { if [ "${VORTEX_DEBUG-}" = "1" ]; then printf "[DEBG] %s\n" "$1"; fi; } note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/task-copy-db-acquia.sh b/scripts/vortex/task-copy-db-acquia.sh index c5f4add75..7696faab2 100755 --- a/scripts/vortex/task-copy-db-acquia.sh +++ b/scripts/vortex/task-copy-db-acquia.sh @@ -47,9 +47,9 @@ VORTEX_TASK_COPY_DB_ACQUIA_STATUS_INTERVAL="${VORTEX_TASK_COPY_DB_ACQUIA_STATUS_ # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/task-copy-files-acquia.sh b/scripts/vortex/task-copy-files-acquia.sh index 6b6306ba3..8bc6635ca 100755 --- a/scripts/vortex/task-copy-files-acquia.sh +++ b/scripts/vortex/task-copy-files-acquia.sh @@ -44,9 +44,9 @@ VORTEX_TASK_COPY_FILES_ACQUIA_STATUS_INTERVAL="${VORTEX_TASK_COPY_FILES_ACQUIA_S # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/task-custom-lagoon.sh b/scripts/vortex/task-custom-lagoon.sh index 562a9c404..94a8a46a4 100755 --- a/scripts/vortex/task-custom-lagoon.sh +++ b/scripts/vortex/task-custom-lagoon.sh @@ -54,9 +54,9 @@ VORTEX_TASK_CUSTOM_LAGOON_CLI_VERSION="${VORTEX_TASK_CUSTOM_LAGOON_CLI_VERSION:- # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/task-purge-cache-acquia.sh b/scripts/vortex/task-purge-cache-acquia.sh index ccf38752c..831b0cb09 100755 --- a/scripts/vortex/task-purge-cache-acquia.sh +++ b/scripts/vortex/task-purge-cache-acquia.sh @@ -44,9 +44,9 @@ VORTEX_TASK_PURGE_CACHE_ACQUIA_STATUS_INTERVAL="${VORTEX_TASK_PURGE_CACHE_ACQUIA # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/update-vortex.sh b/scripts/vortex/update-vortex.sh index 4555de220..0c5e8f6b6 100755 --- a/scripts/vortex/update-vortex.sh +++ b/scripts/vortex/update-vortex.sh @@ -45,9 +45,9 @@ VORTEX_INSTALLER_INTERACTIVE="${VORTEX_INSTALLER_INTERACTIVE:-0}" # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/upload-db-s3.sh b/scripts/vortex/upload-db-s3.sh index cf7b3f4c0..3434cd845 100755 --- a/scripts/vortex/upload-db-s3.sh +++ b/scripts/vortex/upload-db-s3.sh @@ -44,9 +44,9 @@ VORTEX_UPLOAD_DB_S3_STORAGE_CLASS="${VORTEX_UPLOAD_DB_S3_STORAGE_CLASS:-STANDARD # @formatter:off note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on From bc2786aabb62de96cab2bcfff85c6afa70c61fdb Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 11:45:45 +1000 Subject: [PATCH 02/11] [#2351] Honored '@formatter:off' markers in 'lint.scripts.sh' for shfmt. --- .vortex/tests/lint.scripts.sh | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.vortex/tests/lint.scripts.sh b/.vortex/tests/lint.scripts.sh index 9b0fe1677..edc9adae3 100755 --- a/.vortex/tests/lint.scripts.sh +++ b/.vortex/tests/lint.scripts.sh @@ -11,6 +11,30 @@ ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" [ ! -f "${ROOT_DIR}/.vortex/tests/vendor/bin/shellvar" ] && composer --working-dir="${ROOT_DIR}/.vortex/tests" install +# Mask out lines between '# @formatter:off' and '# @formatter:on' so that +# shfmt does not reformat helper functions that are intentionally kept on +# a single line. Each masked line is replaced with a ':' (no-op) placeholder +# indented to match the '# @formatter:off' line's own indentation, so the +# surrounding code parses as valid bash at the expected scope. +mask_protected() { + awk ' + /# @formatter:off/ { + in_block = 1 + match($0, /^[[:space:]]*/) + indent = substr($0, 1, RLENGTH) + print + next + } + /# @formatter:on/ { + in_block = 0 + print + next + } + in_block { print indent ":"; next } + { print } + ' "${1}" +} + targets=() while IFS= read -r -d $'\0'; do targets+=("${REPLY}") @@ -37,7 +61,7 @@ for file in "${targets[@]}"; do exit 1 fi - if ! LC_ALL=C.UTF-8 shfmt -i 2 -ci -s -d "${file}"; then + if ! mask_protected "${file}" | LC_ALL=C.UTF-8 shfmt -i 2 -ci -s -d; then exit 1 fi fi From 8d67173f74113d824c969489bfb31918bcd12594 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 13:20:09 +1000 Subject: [PATCH 03/11] [#2351] Hardened 'lint.scripts.sh' with pipefail and unclosed-block detection. --- .vortex/tests/lint.scripts.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.vortex/tests/lint.scripts.sh b/.vortex/tests/lint.scripts.sh index edc9adae3..8d74fcc4f 100755 --- a/.vortex/tests/lint.scripts.sh +++ b/.vortex/tests/lint.scripts.sh @@ -4,7 +4,7 @@ # # LCOV_EXCL_START -set -eu +set -euo pipefail [ "${VORTEX_DEBUG-}" = "1" ] && set -x ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" @@ -17,7 +17,7 @@ ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" # indented to match the '# @formatter:off' line's own indentation, so the # surrounding code parses as valid bash at the expected scope. mask_protected() { - awk ' + awk -v file="${1}" ' /# @formatter:off/ { in_block = 1 match($0, /^[[:space:]]*/) @@ -32,6 +32,12 @@ mask_protected() { } in_block { print indent ":"; next } { print } + END { + if (in_block) { + printf "Unclosed formatter block in %s: missing # @formatter:on\n", file > "/dev/stderr" + exit 2 + } + } ' "${1}" } From 1c31a33136512eb50a6241970074c6775ea6456c Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 13:20:18 +1000 Subject: [PATCH 04/11] [#2351] Reordered helper functions to 'info, note, task, pass, fail'. --- .vortex/docs/.utils/update-installer-video.sh | 2 +- .../docs/content/contributing/maintenance/script-boilerplate.sh | 2 +- .vortex/docs/content/drupal/provision-example.sh | 2 +- scripts/custom/provision-10-example.sh | 2 +- scripts/custom/provision-20-migration.sh | 2 +- scripts/vortex/deploy-artifact.sh | 2 +- scripts/vortex/deploy-container-registry.sh | 2 +- scripts/vortex/deploy-lagoon.sh | 2 +- scripts/vortex/deploy-webhook.sh | 2 +- scripts/vortex/deploy.sh | 2 +- scripts/vortex/doctor.sh | 2 +- scripts/vortex/download-db-acquia.sh | 2 +- scripts/vortex/download-db-container-registry.sh | 2 +- scripts/vortex/download-db-ftp.sh | 2 +- scripts/vortex/download-db-lagoon.sh | 2 +- scripts/vortex/download-db-s3.sh | 2 +- scripts/vortex/download-db-url.sh | 2 +- scripts/vortex/download-db.sh | 2 +- scripts/vortex/export-db-file.sh | 2 +- scripts/vortex/export-db-image.sh | 2 +- scripts/vortex/export-db.sh | 2 +- scripts/vortex/info.sh | 2 +- scripts/vortex/login-container-registry.sh | 2 +- scripts/vortex/login.sh | 2 +- scripts/vortex/logout.sh | 2 +- scripts/vortex/notify-email.sh | 2 +- scripts/vortex/notify-github.sh | 2 +- scripts/vortex/notify-jira.sh | 2 +- scripts/vortex/notify-newrelic.sh | 2 +- scripts/vortex/notify-slack.sh | 2 +- scripts/vortex/notify-webhook.sh | 2 +- scripts/vortex/notify.sh | 2 +- scripts/vortex/provision-sanitize-db.sh | 2 +- scripts/vortex/provision.sh | 2 +- scripts/vortex/reset.sh | 2 +- scripts/vortex/setup-ssh.sh | 2 +- scripts/vortex/task-copy-db-acquia.sh | 2 +- scripts/vortex/task-copy-files-acquia.sh | 2 +- scripts/vortex/task-custom-lagoon.sh | 2 +- scripts/vortex/task-purge-cache-acquia.sh | 2 +- scripts/vortex/update-vortex.sh | 2 +- scripts/vortex/upload-db-s3.sh | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.vortex/docs/.utils/update-installer-video.sh b/.vortex/docs/.utils/update-installer-video.sh index 2c53126ed..d9112d398 100755 --- a/.vortex/docs/.utils/update-installer-video.sh +++ b/.vortex/docs/.utils/update-installer-video.sh @@ -41,8 +41,8 @@ INSTALLER_BUILD="${PROJECT_ROOT}/.vortex/installer/build/installer.phar" INSTALLER_SOURCE_DIR="${PROJECT_ROOT}/.vortex/installer" # Logging functions -note() { printf " %s\n" "${1}"; } info() { echo -e "\033[0;34m[INFO]\033[0m $1" >&2; } +note() { printf " %s\n" "${1}"; } pass() { echo -e "\033[0;32m[ OK ]\033[0m $1" >&2; } fail() { echo -e "\033[0;31m[FAIL]\033[0m $1" >&2; } diff --git a/.vortex/docs/content/contributing/maintenance/script-boilerplate.sh b/.vortex/docs/content/contributing/maintenance/script-boilerplate.sh index 8f026be4b..7ef4ce890 100755 --- a/.vortex/docs/content/contributing/maintenance/script-boilerplate.sh +++ b/.vortex/docs/content/contributing/maintenance/script-boilerplate.sh @@ -15,8 +15,8 @@ VORTEX_EXAMPLE_URL="${VORTEX_EXAMPLE_URL:-http://example.com}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/docs/content/drupal/provision-example.sh b/.vortex/docs/content/drupal/provision-example.sh index 5d4d0d4d9..090dfb21c 100755 --- a/.vortex/docs/content/drupal/provision-example.sh +++ b/.vortex/docs/content/drupal/provision-example.sh @@ -20,8 +20,8 @@ set -eu # ------------------------------------------------------------------------------ info() { printf " ==> %s\n" "${1}"; } -task() { printf " > %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } drush() { ./vendor/bin/drush -y "$@"; } diff --git a/scripts/custom/provision-10-example.sh b/scripts/custom/provision-10-example.sh index 1cd12d7d3..a55b80f01 100755 --- a/scripts/custom/provision-10-example.sh +++ b/scripts/custom/provision-10-example.sh @@ -20,8 +20,8 @@ set -eu # ------------------------------------------------------------------------------ info() { printf " ==> %s\n" "${1}"; } -task() { printf " > %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } drush() { ./vendor/bin/drush -y "$@"; } diff --git a/scripts/custom/provision-20-migration.sh b/scripts/custom/provision-20-migration.sh index 45e85b391..e211389cd 100755 --- a/scripts/custom/provision-20-migration.sh +++ b/scripts/custom/provision-20-migration.sh @@ -40,9 +40,9 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/deploy-artifact.sh b/scripts/vortex/deploy-artifact.sh index a22fea3e8..61d86db59 100755 --- a/scripts/vortex/deploy-artifact.sh +++ b/scripts/vortex/deploy-artifact.sh @@ -60,9 +60,9 @@ VORTEX_DEPLOY_ARTIFACT_GIT_ARTIFACT_SHA256="${VORTEX_DEPLOY_ARTIFACT_GIT_ARTIFAC # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/deploy-container-registry.sh b/scripts/vortex/deploy-container-registry.sh index d4f6fd91d..7542fd4dd 100755 --- a/scripts/vortex/deploy-container-registry.sh +++ b/scripts/vortex/deploy-container-registry.sh @@ -35,9 +35,9 @@ VORTEX_DEPLOY_CONTAINER_REGISTRY_PASS="${VORTEX_DEPLOY_CONTAINER_REGISTRY_PASS:- # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/deploy-lagoon.sh b/scripts/vortex/deploy-lagoon.sh index d8b54b89a..f85ca14a1 100755 --- a/scripts/vortex/deploy-lagoon.sh +++ b/scripts/vortex/deploy-lagoon.sh @@ -81,9 +81,9 @@ VORTEX_DEPLOY_LAGOON_FAIL_ENV_LIMIT_EXCEEDED="${VORTEX_DEPLOY_LAGOON_FAIL_ENV_LI # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } diff --git a/scripts/vortex/deploy-webhook.sh b/scripts/vortex/deploy-webhook.sh index 905ee104b..66f7a9631 100755 --- a/scripts/vortex/deploy-webhook.sh +++ b/scripts/vortex/deploy-webhook.sh @@ -23,9 +23,9 @@ VORTEX_DEPLOY_WEBHOOK_RESPONSE_STATUS="${VORTEX_DEPLOY_WEBHOOK_RESPONSE_STATUS:- # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/deploy.sh b/scripts/vortex/deploy.sh index a80395701..e571c14d7 100755 --- a/scripts/vortex/deploy.sh +++ b/scripts/vortex/deploy.sh @@ -52,9 +52,9 @@ VORTEX_DEPLOY_ALLOW_SKIP="${VORTEX_DEPLOY_ALLOW_SKIP:-}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/doctor.sh b/scripts/vortex/doctor.sh index b7dae5a22..d015afebf 100755 --- a/scripts/vortex/doctor.sh +++ b/scripts/vortex/doctor.sh @@ -65,9 +65,9 @@ VORTEX_SSH_FILE="${VORTEX_SSH_FILE:-${HOME}/.ssh/id_rsa}" #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } warn() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[33m[WARN] %s\033[0m\n" "${1}" || printf "[WARN] %s\n" "${1}"; } diff --git a/scripts/vortex/download-db-acquia.sh b/scripts/vortex/download-db-acquia.sh index 8b7967850..a79ca9520 100755 --- a/scripts/vortex/download-db-acquia.sh +++ b/scripts/vortex/download-db-acquia.sh @@ -76,9 +76,9 @@ VORTEX_DOWNLOAD_DB_ACQUIA_BACKUP_MAX_WAIT="${!_v:-600}" #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-container-registry.sh b/scripts/vortex/download-db-container-registry.sh index 3e6cf1d24..34574ffe5 100755 --- a/scripts/vortex/download-db-container-registry.sh +++ b/scripts/vortex/download-db-container-registry.sh @@ -48,9 +48,9 @@ VORTEX_DOWNLOAD_DB_CONTAINER_REGISTRY_IMAGE_BASE="${!_v:-${!_vs:-}}" #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-ftp.sh b/scripts/vortex/download-db-ftp.sh index 3a2fd833f..ef661a328 100755 --- a/scripts/vortex/download-db-ftp.sh +++ b/scripts/vortex/download-db-ftp.sh @@ -50,9 +50,9 @@ VORTEX_DOWNLOAD_DB_FTP_DB_FILE="${!_v:-${!_vs:-${!_vss:-db.sql}}}" #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-lagoon.sh b/scripts/vortex/download-db-lagoon.sh index 4128023e3..80bf45ca6 100755 --- a/scripts/vortex/download-db-lagoon.sh +++ b/scripts/vortex/download-db-lagoon.sh @@ -90,9 +90,9 @@ WEBROOT="${WEBROOT:-web}" #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-s3.sh b/scripts/vortex/download-db-s3.sh index 4fe2cfacc..d1d29897b 100755 --- a/scripts/vortex/download-db-s3.sh +++ b/scripts/vortex/download-db-s3.sh @@ -52,9 +52,9 @@ VORTEX_DOWNLOAD_DB_S3_DB_FILE="${!_v:-${!_vs:-${!_vss:-db.sql}}}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db-url.sh b/scripts/vortex/download-db-url.sh index 8b91c209d..051c3b8ff 100755 --- a/scripts/vortex/download-db-url.sh +++ b/scripts/vortex/download-db-url.sh @@ -39,9 +39,9 @@ VORTEX_DOWNLOAD_DB_UNZIP_PASSWORD="${!_v:-}" #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/download-db.sh b/scripts/vortex/download-db.sh index ab0a4eff3..9682200ed 100755 --- a/scripts/vortex/download-db.sh +++ b/scripts/vortex/download-db.sh @@ -45,9 +45,9 @@ VORTEX_DOWNLOAD_DB_DIR="${!_v:-${!_vs:-./.data}}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/export-db-file.sh b/scripts/vortex/export-db-file.sh index 0c19d6e33..19f62059f 100755 --- a/scripts/vortex/export-db-file.sh +++ b/scripts/vortex/export-db-file.sh @@ -15,9 +15,9 @@ VORTEX_EXPORT_DB_FILE_DIR="${VORTEX_EXPORT_DB_FILE_DIR:-${VORTEX_DB_DIR:-./.data # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/export-db-image.sh b/scripts/vortex/export-db-image.sh index a04e659a1..174be4c78 100755 --- a/scripts/vortex/export-db-image.sh +++ b/scripts/vortex/export-db-image.sh @@ -29,9 +29,9 @@ VORTEX_EXPORT_DB_IMAGE_DIR="${VORTEX_EXPORT_DB_IMAGE_DIR:-${VORTEX_DB_DIR}}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/export-db.sh b/scripts/vortex/export-db.sh index 28781069a..79aab82e2 100755 --- a/scripts/vortex/export-db.sh +++ b/scripts/vortex/export-db.sh @@ -21,9 +21,9 @@ VORTEX_EXPORT_DB_IMAGE="${VORTEX_EXPORT_DB_IMAGE:-${VORTEX_DB_IMAGE:-}}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/info.sh b/scripts/vortex/info.sh index 00b79af33..75fc5dc2a 100755 --- a/scripts/vortex/info.sh +++ b/scripts/vortex/info.sh @@ -18,9 +18,9 @@ VORTEX_SHOW_LOGIN="${VORTEX_SHOW_LOGIN:-}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/login-container-registry.sh b/scripts/vortex/login-container-registry.sh index d2504f94a..7340cb8aa 100755 --- a/scripts/vortex/login-container-registry.sh +++ b/scripts/vortex/login-container-registry.sh @@ -37,9 +37,9 @@ VORTEX_LOGIN_CONTAINER_REGISTRY_DOCKER_CONFIG="${VORTEX_LOGIN_CONTAINER_REGISTRY # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/login.sh b/scripts/vortex/login.sh index 7458c6b8c..a447b1d15 100755 --- a/scripts/vortex/login.sh +++ b/scripts/vortex/login.sh @@ -15,9 +15,9 @@ VORTEX_LOGIN_UNBLOCK_ADMIN="${VORTEX_LOGIN_UNBLOCK_ADMIN:-${VORTEX_UNBLOCK_ADMIN # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/logout.sh b/scripts/vortex/logout.sh index 9c1480072..02e00ecde 100755 --- a/scripts/vortex/logout.sh +++ b/scripts/vortex/logout.sh @@ -15,9 +15,9 @@ VORTEX_LOGOUT_BLOCK_ADMIN="${VORTEX_LOGOUT_BLOCK_ADMIN:-${VORTEX_UNBLOCK_ADMIN:- # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-email.sh b/scripts/vortex/notify-email.sh index 913354bae..f3655d150 100755 --- a/scripts/vortex/notify-email.sh +++ b/scripts/vortex/notify-email.sh @@ -58,9 +58,9 @@ VORTEX_NOTIFY_EMAIL_BRANCHES="${VORTEX_NOTIFY_EMAIL_BRANCHES:-}" #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-github.sh b/scripts/vortex/notify-github.sh index 8d5560590..73e5e60fd 100755 --- a/scripts/vortex/notify-github.sh +++ b/scripts/vortex/notify-github.sh @@ -49,9 +49,9 @@ VORTEX_NOTIFY_GITHUB_BRANCHES="${VORTEX_NOTIFY_GITHUB_BRANCHES:-}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-jira.sh b/scripts/vortex/notify-jira.sh index 6d00ef80b..fad5911d0 100755 --- a/scripts/vortex/notify-jira.sh +++ b/scripts/vortex/notify-jira.sh @@ -69,9 +69,9 @@ VORTEX_NOTIFY_JIRA_BRANCHES="${VORTEX_NOTIFY_JIRA_BRANCHES:-}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-newrelic.sh b/scripts/vortex/notify-newrelic.sh index ba5aec159..23c57a4d6 100755 --- a/scripts/vortex/notify-newrelic.sh +++ b/scripts/vortex/notify-newrelic.sh @@ -80,9 +80,9 @@ VORTEX_NOTIFY_NEWRELIC_BRANCHES="${VORTEX_NOTIFY_NEWRELIC_BRANCHES:-main,master, # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-slack.sh b/scripts/vortex/notify-slack.sh index cc40e0c01..4df55ca46 100755 --- a/scripts/vortex/notify-slack.sh +++ b/scripts/vortex/notify-slack.sh @@ -55,9 +55,9 @@ VORTEX_NOTIFY_SLACK_BRANCHES="${VORTEX_NOTIFY_SLACK_BRANCHES:-}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify-webhook.sh b/scripts/vortex/notify-webhook.sh index 869ed6123..83dd2633d 100755 --- a/scripts/vortex/notify-webhook.sh +++ b/scripts/vortex/notify-webhook.sh @@ -52,9 +52,9 @@ VORTEX_NOTIFY_WEBHOOK_BRANCHES="${VORTEX_NOTIFY_WEBHOOK_BRANCHES:-}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/notify.sh b/scripts/vortex/notify.sh index f37fbb424..3ef7da893 100755 --- a/scripts/vortex/notify.sh +++ b/scripts/vortex/notify.sh @@ -48,9 +48,9 @@ VORTEX_NOTIFY_LOGIN_URL="${VORTEX_NOTIFY_LOGIN_URL:-}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/provision-sanitize-db.sh b/scripts/vortex/provision-sanitize-db.sh index 7bb6ecee0..86895cd67 100755 --- a/scripts/vortex/provision-sanitize-db.sh +++ b/scripts/vortex/provision-sanitize-db.sh @@ -27,9 +27,9 @@ VORTEX_PROVISION_SANITIZE_DB_ADDITIONAL_FILE="${VORTEX_PROVISION_SANITIZE_DB_ADD # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/provision.sh b/scripts/vortex/provision.sh index 6bd3c679c..6b8ba745b 100755 --- a/scripts/vortex/provision.sh +++ b/scripts/vortex/provision.sh @@ -84,9 +84,9 @@ VORTEX_PROVISION_DB_IMAGE="${VORTEX_PROVISION_DB_IMAGE:-${VORTEX_DB_IMAGE:-}}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/reset.sh b/scripts/vortex/reset.sh index de2554933..ef69e7c59 100755 --- a/scripts/vortex/reset.sh +++ b/scripts/vortex/reset.sh @@ -12,9 +12,9 @@ set -eu # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/setup-ssh.sh b/scripts/vortex/setup-ssh.sh index 02112c19b..950f96004 100755 --- a/scripts/vortex/setup-ssh.sh +++ b/scripts/vortex/setup-ssh.sh @@ -34,9 +34,9 @@ VORTEX_SSH_DISABLE_STRICT_HOST_KEY_CHECKING="${VORTEX_SSH_DISABLE_STRICT_HOST_KE # @formatter:off debg() { if [ "${VORTEX_DEBUG-}" = "1" ]; then printf "[DEBG] %s\n" "$1"; fi; } +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/task-copy-db-acquia.sh b/scripts/vortex/task-copy-db-acquia.sh index 7696faab2..1c10d8475 100755 --- a/scripts/vortex/task-copy-db-acquia.sh +++ b/scripts/vortex/task-copy-db-acquia.sh @@ -46,9 +46,9 @@ VORTEX_TASK_COPY_DB_ACQUIA_STATUS_INTERVAL="${VORTEX_TASK_COPY_DB_ACQUIA_STATUS_ #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/task-copy-files-acquia.sh b/scripts/vortex/task-copy-files-acquia.sh index 8bc6635ca..5a1bf6ec6 100755 --- a/scripts/vortex/task-copy-files-acquia.sh +++ b/scripts/vortex/task-copy-files-acquia.sh @@ -43,9 +43,9 @@ VORTEX_TASK_COPY_FILES_ACQUIA_STATUS_INTERVAL="${VORTEX_TASK_COPY_FILES_ACQUIA_S #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/task-custom-lagoon.sh b/scripts/vortex/task-custom-lagoon.sh index 94a8a46a4..93d4120b7 100755 --- a/scripts/vortex/task-custom-lagoon.sh +++ b/scripts/vortex/task-custom-lagoon.sh @@ -53,9 +53,9 @@ VORTEX_TASK_CUSTOM_LAGOON_CLI_VERSION="${VORTEX_TASK_CUSTOM_LAGOON_CLI_VERSION:- # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/task-purge-cache-acquia.sh b/scripts/vortex/task-purge-cache-acquia.sh index 831b0cb09..9761862ef 100755 --- a/scripts/vortex/task-purge-cache-acquia.sh +++ b/scripts/vortex/task-purge-cache-acquia.sh @@ -43,9 +43,9 @@ VORTEX_TASK_PURGE_CACHE_ACQUIA_STATUS_INTERVAL="${VORTEX_TASK_PURGE_CACHE_ACQUIA #------------------------------------------------------------------------------- # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/update-vortex.sh b/scripts/vortex/update-vortex.sh index 0c5e8f6b6..d4cdc0f4d 100755 --- a/scripts/vortex/update-vortex.sh +++ b/scripts/vortex/update-vortex.sh @@ -44,9 +44,9 @@ VORTEX_INSTALLER_INTERACTIVE="${VORTEX_INSTALLER_INTERACTIVE:-0}" # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/scripts/vortex/upload-db-s3.sh b/scripts/vortex/upload-db-s3.sh index 3434cd845..f7c8a609d 100755 --- a/scripts/vortex/upload-db-s3.sh +++ b/scripts/vortex/upload-db-s3.sh @@ -43,9 +43,9 @@ VORTEX_UPLOAD_DB_S3_STORAGE_CLASS="${VORTEX_UPLOAD_DB_S3_STORAGE_CLASS:-STANDARD # ------------------------------------------------------------------------------ # @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on From b1df9fa811787084216eeddc70ba65f17fa19e88 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 13:22:43 +1000 Subject: [PATCH 05/11] Updated snapshots. --- .../_baseline/scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-20-migration.sh | 6 +++--- .../scripts/custom/provision-20-migration.sh | 6 +++--- .../scripts/custom/provision-20-migration.sh | 6 +++--- .../scripts/custom/provision-20-migration.sh | 6 +++--- .../scripts/custom/provision-20-migration.sh | 6 +++--- .../scripts/custom/provision-20-migration.sh | 6 +++--- .../scripts/custom/provision-20-migration.sh | 6 +++--- .../scripts/custom/provision-20-migration.sh | 6 +++--- .../scripts/custom/provision-20-migration.sh | 6 +++--- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh index be78d7e7a..d1a6e9bc3 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh @@ -20,8 +20,8 @@ set -eu # ------------------------------------------------------------------------------ info() { printf " ==> %s\n" "${1}"; } -task() { printf " > %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh index fa75d7649..e211389cd 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh @@ -40,10 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -note() { printf " %s\n" "${1}"; } -task() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } -pass() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s\033[0m\n" "${1}" || printf "[ OK ] %s\n" "${1}"; } +note() { printf " %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } # @formatter:on From c09ba9291d7b994c45d8497a7b912388f079c882 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 13:51:07 +1000 Subject: [PATCH 06/11] [#2351] Paired 'task()' with 'pass()' calls in custom provision scripts. --- scripts/custom/provision-10-example.sh | 15 +++++++++++++-- scripts/custom/provision-20-migration.sh | 11 +++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/scripts/custom/provision-10-example.sh b/scripts/custom/provision-10-example.sh index a55b80f01..573b06b73 100755 --- a/scripts/custom/provision-10-example.sh +++ b/scripts/custom/provision-10-example.sh @@ -19,9 +19,13 @@ set -eu # ------------------------------------------------------------------------------ -info() { printf " ==> %s\n" "${1}"; } +# @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { printf " > %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } +fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +# @formatter:on drush() { ./vendor/bin/drush -y "$@"; } @@ -36,26 +40,31 @@ if echo "${environment}" | grep -q -e dev -e stage -e ci -e local; then task "Setting site name." drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" + pass "Set site name." #;< MODULES task "Installing contrib modules." drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." #;> MODULES #;< SERVICE_REDIS task "Installing Redis module." drush pm:install redis || true + pass "Installed Redis module." #;> SERVICE_REDIS #;< SERVICE_CLAMAV task "Installing and configuring ClamAV." drush pm:install clamav drush config-set clamav.settings mode_daemon_tcpip.hostname clamav + pass "Installed and configured ClamAV." #;> SERVICE_CLAMAV #;< SERVICE_SOLR task "Installing Solr search modules." drush pm:install search_api search_api_solr + pass "Installed Solr search modules." #;> SERVICE_SOLR # Enable custom site module and run its deployment hooks. @@ -74,9 +83,11 @@ if echo "${environment}" | grep -q -e dev -e stage -e ci -e local; then #;< CUSTOM_MODULE_DEMO drush pm:install ys_demo #;> CUSTOM_MODULE_DEMO + pass "Installed custom site modules." task "Running deployment hooks." drush deploy:hook + pass "Ran deployment hooks." # Conditionally perform an action if this is a "fresh" database. if [ "${VORTEX_PROVISION_OVERRIDE_DB:-0}" = "1" ]; then diff --git a/scripts/custom/provision-20-migration.sh b/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/scripts/custom/provision-20-migration.sh +++ b/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo From 95fdb84bcf105e266c3ad2687d220a3707d70762 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 13:52:56 +1000 Subject: [PATCH 07/11] Updated snapshots. --- .../scripts/custom/provision-10-example.sh | 15 +++++++++++++-- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 7 +++---- .../scripts/custom/provision-10-example.sh | 4 ++-- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 9 +++++---- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-20-migration.sh | 11 +++++++++-- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 6 +++--- .../scripts/custom/provision-10-example.sh | 7 ++++--- .../names/scripts/custom/provision-10-example.sh | 8 ++++---- .../scripts/custom/provision-10-example.sh | 5 +++-- .../scripts/custom/provision-10-example.sh | 7 ++++--- .../scripts/custom/provision-10-example.sh | 7 ++++--- .../scripts/custom/provision-10-example.sh | 5 +++-- .../scripts/custom/provision-10-example.sh | 9 +++++---- .../scripts/custom/provision-10-example.sh | 11 +++++++---- 34 files changed, 175 insertions(+), 92 deletions(-) diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh index d1a6e9bc3..6f81916a2 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh @@ -19,9 +19,13 @@ set -eu # ------------------------------------------------------------------------------ -info() { printf " ==> %s\n" "${1}"; } +# @formatter:off +info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { printf " > %s\n" "${1}"; } +task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } +pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } +fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +# @formatter:on drush() { ./vendor/bin/drush -y "$@"; } @@ -36,19 +40,24 @@ if echo "${environment}" | grep -q -e dev -e stage -e ci -e local; then task "Setting site name." drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" + pass "Set site name." task "Installing contrib modules." drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." drush pm:install redis || true + pass "Installed Redis module." task "Installing and configuring ClamAV." drush pm:install clamav drush config-set clamav.settings mode_daemon_tcpip.hostname clamav + pass "Installed and configured ClamAV." task "Installing Solr search modules." drush pm:install search_api search_api_solr + pass "Installed Solr search modules." # Enable custom site module and run its deployment hooks. # @@ -60,9 +69,11 @@ if echo "${environment}" | grep -q -e dev -e stage -e ci -e local; then drush pm:install sw_search drush pm:install sw_demo + pass "Installed custom site modules." task "Running deployment hooks." drush deploy:hook + pass "Ran deployment hooks." # Conditionally perform an action if this is a "fresh" database. if [ "${VORTEX_PROVISION_OVERRIDE_DB:-0}" = "1" ]; then diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh index fbba62577..31a4ae53c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -55,7 +55,6 @@ +@@ -64,7 +64,6 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh index 458f15b2b..d09cc43d6 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh @@ -1,9 +1,8 @@ -@@ -59,8 +59,6 @@ +@@ -68,7 +68,6 @@ drush pm:install sw_search - drush pm:install sw_demo -- - task "Running deployment hooks." - drush deploy:hook + pass "Installed custom site modules." + task "Running deployment hooks." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh index 7a12a6146..368e04862 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -57,8 +57,6 @@ +@@ -66,8 +66,6 @@ task "Installing custom site modules." drush pm:install sw_base - drush pm:install sw_search - drush pm:install sw_demo + pass "Installed custom site modules." - task "Running deployment hooks." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh index 007d8e6b9..371ab33e0 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh @@ -1,12 +1,12 @@ -@@ -55,11 +55,6 @@ +@@ -64,11 +64,7 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." - drush pm:install sw_base -- + - drush pm:install sw_search - - drush pm:install sw_demo + pass "Installed custom site modules." task "Running deployment hooks." - drush deploy:hook diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh index 72f8e4d2a..2de302bd1 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh @@ -1,14 +1,15 @@ -@@ -47,9 +47,6 @@ - drush pm:install clamav +@@ -55,10 +55,6 @@ drush config-set clamav.settings mode_daemon_tcpip.hostname clamav + pass "Installed and configured ClamAV." - task "Installing Solr search modules." - drush pm:install search_api search_api_solr +- pass "Installed Solr search modules." - # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -56,8 +53,6 @@ +@@ -65,8 +61,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base @@ -16,4 +17,4 @@ - drush pm:install sw_search drush pm:install sw_demo - + pass "Installed custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh index e211389cd..fa5ad85c4 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh @@ -104,13 +104,17 @@ run_migration() { drush migrate:messages "${migration_name}" exit 1 } + + pass "Migrated: ${migration_name}." } # Detect if existing migration source database is corrupted. if [ "${DRUPAL_MIGRATION_SOURCE_DB_IMPORT}" != "1" ]; then note "Source database import is set to be skipped. Checking existing database." task "Probing for '${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}' table in the source database." - if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + if drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION_SOURCE_DB_PROBE_TABLE}" >/dev/null 2>&1; then + pass "Source database is intact." + else note "Migration source database is corrupted or empty. Re-importing." DRUPAL_MIGRATION_SOURCE_DB_IMPORT=1 fi @@ -137,18 +141,21 @@ if ! drush sql:query --database=migrate "SELECT COUNT(*) FROM ${DRUPAL_MIGRATION drush sql:query --database=migrate "SHOW TABLES;" exit 1 fi +pass "Verified migration source database." # Enable custom migration modules. task "Enabling migration modules." drush pm:install ys_migrate +pass "Enabled migration modules." -task "Starting migrations." +info "Starting migrations." if [ "${DRUPAL_MIGRATION_ROLLBACK_SKIP}" = "1" ]; then note "Skipping rollback of all migrations." else task "Rolling back all migrations." drush migrate:rollback --all || true + pass "Rolled back all migrations." fi echo diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh index ae73a79b9..274dd442b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh index 5edfc36ec..c6887a108 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh index b69459967..e20f89c1d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh index cb1da6d9f..a6150e9ce 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_split media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh index e364028ad..380a8002f 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_split config_update media pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh index 9a4edad1b..80161c9bf 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_split config_update media environment_indicator redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh index 3319f534d..6a1417b5a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh index b539b7f82..b21380741 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh index 9d4f613fd..73e040efb 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh index 3b69b1e55..ae83f3306 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt stage_file_proxy xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh index fc258f924..eb9a3db4f 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh @@ -1,9 +1,9 @@ -@@ -38,7 +38,7 @@ - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" +@@ -43,7 +43,7 @@ + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield xmlsitemap + pass "Installed contrib modules." task "Installing Redis module." - drush pm:install redis || true diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh index accac3172..7237e5752 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh @@ -1,10 +1,11 @@ -@@ -37,9 +37,6 @@ - task "Setting site name." +@@ -42,10 +42,6 @@ drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" + pass "Set site name." - task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +- pass "Installed contrib modules." - task "Installing Redis module." drush pm:install redis || true - + pass "Installed Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh index 496281d48..4279ead37 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh @@ -1,13 +1,13 @@ -@@ -35,7 +35,7 @@ +@@ -39,7 +39,7 @@ note "Running example operations in non-production environment." task "Setting site name." - drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" + drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'New hope')->save();" + pass "Set site name." task "Installing contrib modules." - drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -@@ -55,11 +55,11 @@ +@@ -64,11 +64,11 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." @@ -19,6 +19,6 @@ - drush pm:install sw_demo + drush pm:install the_force_demo + pass "Installed custom site modules." task "Running deployment hooks." - drush deploy:hook diff --git a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh index c68100be9..585fe3975 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh @@ -1,9 +1,10 @@ -@@ -40,9 +40,6 @@ - task "Installing contrib modules." +@@ -46,10 +46,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." - task "Installing Redis module." - drush pm:install redis || true +- pass "Installed Redis module." - task "Installing and configuring ClamAV." drush pm:install clamav diff --git a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh index 9cb0ae6e4..eda5b8b3b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh @@ -1,11 +1,12 @@ -@@ -43,10 +43,6 @@ - task "Installing Redis module." +@@ -50,11 +50,6 @@ drush pm:install redis || true + pass "Installed Redis module." - task "Installing and configuring ClamAV." - drush pm:install clamav - drush config-set clamav.settings mode_daemon_tcpip.hostname clamav +- pass "Installed and configured ClamAV." - task "Installing Solr search modules." drush pm:install search_api search_api_solr - + pass "Installed Solr search modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh index 9cb0ae6e4..eda5b8b3b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh @@ -1,11 +1,12 @@ -@@ -43,10 +43,6 @@ - task "Installing Redis module." +@@ -50,11 +50,6 @@ drush pm:install redis || true + pass "Installed Redis module." - task "Installing and configuring ClamAV." - drush pm:install clamav - drush config-set clamav.settings mode_daemon_tcpip.hostname clamav +- pass "Installed and configured ClamAV." - task "Installing Solr search modules." drush pm:install search_api search_api_solr - + pass "Installed Solr search modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh index c68100be9..585fe3975 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh @@ -1,9 +1,10 @@ -@@ -40,9 +40,6 @@ - task "Installing contrib modules." +@@ -46,10 +46,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." - task "Installing Redis module." - drush pm:install redis || true +- pass "Installed Redis module." - task "Installing and configuring ClamAV." drush pm:install clamav diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh index 72f8e4d2a..2de302bd1 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh @@ -1,14 +1,15 @@ -@@ -47,9 +47,6 @@ - drush pm:install clamav +@@ -55,10 +55,6 @@ drush config-set clamav.settings mode_daemon_tcpip.hostname clamav + pass "Installed and configured ClamAV." - task "Installing Solr search modules." - drush pm:install search_api search_api_solr +- pass "Installed Solr search modules." - # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -56,8 +53,6 @@ +@@ -65,8 +61,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base @@ -16,4 +17,4 @@ - drush pm:install sw_search drush pm:install sw_demo - + pass "Installed custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh index 9c9daadd5..8ca2b1165 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh @@ -1,21 +1,24 @@ -@@ -40,16 +40,6 @@ - task "Installing contrib modules." +@@ -46,19 +46,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + pass "Installed contrib modules." - task "Installing Redis module." - drush pm:install redis || true +- pass "Installed Redis module." - - task "Installing and configuring ClamAV." - drush pm:install clamav - drush config-set clamav.settings mode_daemon_tcpip.hostname clamav +- pass "Installed and configured ClamAV." - - task "Installing Solr search modules." - drush pm:install search_api search_api_solr +- pass "Installed Solr search modules." - # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -56,8 +46,6 @@ +@@ -65,8 +52,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base @@ -23,4 +26,4 @@ - drush pm:install sw_search drush pm:install sw_demo - + pass "Installed custom site modules." From 7f4bf2d52e1479d9cf60cc19ddb5a17c66af017c Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 14:30:31 +1000 Subject: [PATCH 08/11] [#2351] Restored simplified helper style in 'provision-10-example.sh'. --- scripts/custom/provision-10-example.sh | 9 +++------ scripts/custom/provision-20-migration.sh | 7 +++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/custom/provision-10-example.sh b/scripts/custom/provision-10-example.sh index 573b06b73..ac74f32b5 100755 --- a/scripts/custom/provision-10-example.sh +++ b/scripts/custom/provision-10-example.sh @@ -19,13 +19,10 @@ set -eu # ------------------------------------------------------------------------------ -# @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } -# @formatter:on +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } drush() { ./vendor/bin/drush -y "$@"; } diff --git a/scripts/custom/provision-20-migration.sh b/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/scripts/custom/provision-20-migration.sh +++ b/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } From 13ec3db4be851b8264067a53c7a5e76e54523886 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 14:34:05 +1000 Subject: [PATCH 09/11] Updated snapshots. --- .../_baseline/scripts/custom/provision-10-example.sh | 9 +++------ .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 4 ++-- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-20-migration.sh | 7 +++---- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../modules_none/scripts/custom/provision-10-example.sh | 2 +- .../names/scripts/custom/provision-10-example.sh | 4 ++-- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 4 ++-- .../services_none/scripts/custom/provision-10-example.sh | 4 ++-- 34 files changed, 58 insertions(+), 70 deletions(-) diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh index 6f81916a2..933dad580 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh @@ -19,13 +19,10 @@ set -eu # ------------------------------------------------------------------------------ -# @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } -# @formatter:on +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh index 31a4ae53c..2599251e7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -64,7 +64,6 @@ +@@ -61,7 +61,6 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh index d09cc43d6..75fb48436 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -68,7 +68,6 @@ +@@ -65,7 +65,6 @@ drush pm:install sw_search diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh index 368e04862..647b4d400 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -66,8 +66,6 @@ +@@ -63,8 +63,6 @@ task "Installing custom site modules." drush pm:install sw_base diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh index 371ab33e0..cf6419d47 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -64,11 +64,7 @@ +@@ -61,11 +61,7 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh index 2de302bd1..bf4f29491 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -55,10 +55,6 @@ +@@ -52,10 +52,6 @@ drush config-set clamav.settings mode_daemon_tcpip.hostname clamav pass "Installed and configured ClamAV." @@ -9,7 +9,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -65,8 +61,6 @@ +@@ -62,8 +58,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh index fa5ad85c4..f76154ff7 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh @@ -40,11 +40,10 @@ VORTEX_DOWNLOAD_DB2_FILE="${VORTEX_DOWNLOAD_DB2_FILE:-db2.sql}" # ------------------------------------------------------------------------------ # @formatter:off -info() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[36m[INFO] %s\033[0m\n" "${1}" || printf "[INFO] %s\n" "${1}"; } +info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } -task() { _TASK_START=$(date +%s); [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[34m[TASK] %s\033[0m\n" "${1}" || printf "[TASK] %s\n" "${1}"; } -pass() { _d=""; [ -n "${_TASK_START:-}" ] && _d=" ($(($(date +%s) - _TASK_START))s)" && unset _TASK_START; [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[32m[ OK ] %s%s\033[0m\n" "${1}" "${_d}" || printf "[ OK ] %s%s\n" "${1}" "${_d}"; } -fail() { [ "${TERM:-}" != "dumb" ] && tput colors >/dev/null 2>&1 && printf "\033[31m[FAIL] %s\033[0m\n" "${1}" || printf "[FAIL] %s\n" "${1}"; } +task() { printf " > %s\n" "${1}"; } +pass() { printf " < %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh index 274dd442b..d82f3eb9c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh index c6887a108..3fc5db0ef 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh index e20f89c1d..3e91c57a5 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh index a6150e9ce..769beada1 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh index 380a8002f..d3f6cefd2 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh index 80161c9bf..ae02d80a3 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh index 6a1417b5a..ee49a76bc 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh index b21380741..b19ce5b4f 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh index 73e040efb..4a890354d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh index ae83f3306..7d4728237 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh index eb9a3db4f..2daa9f969 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh index 7237e5752..1b2f92043 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -42,10 +42,6 @@ +@@ -39,10 +39,6 @@ drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" pass "Set site name." diff --git a/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh index 4279ead37..b7eb5aedb 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -39,7 +39,7 @@ +@@ -36,7 +36,7 @@ note "Running example operations in non-production environment." task "Setting site name." @@ -7,7 +7,7 @@ pass "Set site name." task "Installing contrib modules." -@@ -64,11 +64,11 @@ +@@ -61,11 +61,11 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh index 585fe3975..09a74fdd8 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -46,10 +46,6 @@ +@@ -43,10 +43,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh index eda5b8b3b..846e4e39c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -50,11 +50,6 @@ +@@ -47,11 +47,6 @@ drush pm:install redis || true pass "Installed Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh index eda5b8b3b..846e4e39c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -50,11 +50,6 @@ +@@ -47,11 +47,6 @@ drush pm:install redis || true pass "Installed Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh index 585fe3975..09a74fdd8 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -46,10 +46,6 @@ +@@ -43,10 +43,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh index 2de302bd1..bf4f29491 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -55,10 +55,6 @@ +@@ -52,10 +52,6 @@ drush config-set clamav.settings mode_daemon_tcpip.hostname clamav pass "Installed and configured ClamAV." @@ -9,7 +9,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -65,8 +61,6 @@ +@@ -62,8 +58,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh index 8ca2b1165..239ae7743 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -46,19 +46,6 @@ +@@ -43,19 +43,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." @@ -18,7 +18,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -65,8 +52,6 @@ +@@ -62,8 +49,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base From 530f8a119d5f7f01be82a3b5ef8ca44738f8eda9 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 14:57:34 +1000 Subject: [PATCH 10/11] [#2351] Added simplified 'fail()' to custom provision scripts. --- scripts/custom/provision-10-example.sh | 1 + scripts/custom/provision-20-migration.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/custom/provision-10-example.sh b/scripts/custom/provision-10-example.sh index ac74f32b5..d9d0b1075 100755 --- a/scripts/custom/provision-10-example.sh +++ b/scripts/custom/provision-10-example.sh @@ -23,6 +23,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } drush() { ./vendor/bin/drush -y "$@"; } diff --git a/scripts/custom/provision-20-migration.sh b/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/scripts/custom/provision-20-migration.sh +++ b/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } From 3f6fa8da977490adb3cd1a40581045c9b93f7eb1 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 23 Apr 2026 14:58:49 +1000 Subject: [PATCH 11/11] Updated snapshots. --- .../_baseline/scripts/custom/provision-10-example.sh | 1 + .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 4 ++-- .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-20-migration.sh | 1 + .../scripts/custom/provision-10-example.sh | 2 +- .../modules_no_coffee/scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../modules_no_shield/scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../modules_none/scripts/custom/provision-10-example.sh | 2 +- .../names/scripts/custom/provision-10-example.sh | 4 ++-- .../scripts/custom/provision-10-example.sh | 2 +- .../scripts/custom/provision-10-example.sh | 2 +- .../services_no_clamav/scripts/custom/provision-10-example.sh | 2 +- .../services_no_redis/scripts/custom/provision-10-example.sh | 2 +- .../services_no_solr/scripts/custom/provision-10-example.sh | 4 ++-- .../services_none/scripts/custom/provision-10-example.sh | 4 ++-- 34 files changed, 38 insertions(+), 28 deletions(-) diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh index 933dad580..9a7b11cda 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/custom/provision-10-example.sh @@ -23,6 +23,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh index 2599251e7..f7fe858aa 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -61,7 +61,6 @@ +@@ -62,7 +62,6 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh index 75fb48436..7ac5bf0eb 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -65,7 +65,6 @@ +@@ -66,7 +66,6 @@ drush pm:install sw_search diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh index 647b4d400..48b459189 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -63,8 +63,6 @@ +@@ -64,8 +64,6 @@ task "Installing custom site modules." drush pm:install sw_base diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh index cf6419d47..88968deb0 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -61,11 +61,7 @@ +@@ -62,11 +62,7 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh index bf4f29491..dbaecddf1 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -52,10 +52,6 @@ +@@ -53,10 +53,6 @@ drush config-set clamav.settings mode_daemon_tcpip.hostname clamav pass "Installed and configured ClamAV." @@ -9,7 +9,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -62,8 +58,6 @@ +@@ -63,8 +59,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_acquia/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_container_registry/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_ftp/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_lagoon/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_s3/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_download_source_url/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh index f76154ff7..46ab2921c 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/scripts/custom/provision-20-migration.sh @@ -44,6 +44,7 @@ info() { printf " ==> %s\n" "${1}"; } note() { printf " %s\n" "${1}"; } task() { printf " > %s\n" "${1}"; } pass() { printf " < %s\n" "${1}"; } +fail() { printf " ! %s\n" "${1}"; } # @formatter:on drush() { ./vendor/bin/drush -y "$@"; } diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh index d82f3eb9c..11a996ff2 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_admin_toolbar/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh index 3fc5db0ef..153e0f165 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh index 3e91c57a5..1c23c23fa 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh index 769beada1..2e48cb9e0 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh index d3f6cefd2..b9574fca1 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh index ae02d80a3..d8ac969c8 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh index ee49a76bc..154bbb57f 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh index b19ce5b4f..71e0ede02 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh index 4a890354d..c0d3985ab 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh index 7d4728237..29d15eee9 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh index 2daa9f969..06113e960 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ pass "Set site name." task "Installing contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh index 1b2f92043..accabc146 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -39,10 +39,6 @@ +@@ -40,10 +40,6 @@ drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" pass "Set site name." diff --git a/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh index b7eb5aedb..c20eec6b2 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/names/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ note "Running example operations in non-production environment." task "Setting site name." @@ -7,7 +7,7 @@ pass "Set site name." task "Installing contrib modules." -@@ -61,11 +61,11 @@ +@@ -62,11 +62,11 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh index 09a74fdd8..02a15fa7d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,10 +43,6 @@ +@@ -44,10 +44,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh index 846e4e39c..493a79c34 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -47,11 +47,6 @@ +@@ -48,11 +48,6 @@ drush pm:install redis || true pass "Installed Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh index 846e4e39c..493a79c34 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -47,11 +47,6 @@ +@@ -48,11 +48,6 @@ drush pm:install redis || true pass "Installed Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh index 09a74fdd8..02a15fa7d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,10 +43,6 @@ +@@ -44,10 +44,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh index bf4f29491..dbaecddf1 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -52,10 +52,6 @@ +@@ -53,10 +53,6 @@ drush config-set clamav.settings mode_daemon_tcpip.hostname clamav pass "Installed and configured ClamAV." @@ -9,7 +9,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -62,8 +58,6 @@ +@@ -63,8 +59,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh b/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh index 239ae7743..125514505 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/custom/provision-10-example.sh @@ -1,4 +1,4 @@ -@@ -43,19 +43,6 @@ +@@ -44,19 +44,6 @@ drush pm:install admin_toolbar coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." @@ -18,7 +18,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -62,8 +49,6 @@ +@@ -63,8 +50,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base