From d48bec75f2fc4887bc3ed8d262f0d13098c11d3c Mon Sep 17 00:00:00 2001 From: David Alger Date: Thu, 27 Jun 2019 10:28:20 -0500 Subject: [PATCH 1/2] Fixed bug where 'db' commands broke due to template overhaul in 0.1.0 release --- commands/db.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commands/db.cmd b/commands/db.cmd index 5065d428..be22b471 100644 --- a/commands/db.cmd +++ b/commands/db.cmd @@ -12,14 +12,14 @@ fi ## load connection information for the mysql service eval "$(grep "^MYSQL_" "${WARDEN_ENV_PATH}/.env")" -eval "$(grep -E '^\W+- MYSQL_.*=\$\{.*\}' "${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.yml" | sed -E 's/.*- //g')" +eval "$(grep -E '^\W+- MYSQL_.*=\$\{.*\}' "${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.base.yml" | sed -E 's/.*- //g')" if [[ -f "${WARDEN_ENV_PATH}/.warden/warden-env.yml" ]]; then eval "$(grep -E '^\W+- MYSQL_.*=\$\{.*\}' "${WARDEN_ENV_PATH}/.warden/warden-env.yml" | sed -E 's/.*- //g')" fi -if [[ -f "${WARDEN_ENV_PATH}/.warden/warden-env.${WARDEN_ENV_TYPE}.yml" ]]; then - eval "$(grep -E '^\W+- MYSQL_.*=\$\{.*\}' "${WARDEN_ENV_PATH}/.warden/warden-env.${WARDEN_ENV_TYPE}.yml" | sed -E 's/.*- //g')" +if [[ -f "${WARDEN_ENV_PATH}/.warden/warden-env.${WARDEN_ENV_SUBT}.yml" ]]; then + eval "$(grep -E '^\W+- MYSQL_.*=\$\{.*\}' "${WARDEN_ENV_PATH}/.warden/warden-env.${WARDEN_ENV_SUBT}.yml" | sed -E 's/.*- //g')" fi ## sub-command execution From a00dabb803b581a82828db0a9fa550736b2b65f6 Mon Sep 17 00:00:00 2001 From: David Alger Date: Thu, 27 Jun 2019 10:31:13 -0500 Subject: [PATCH 2/2] Updated CL --- CHANGELOG.md | 5 +++++ commands/usage.help | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6824a2d6..3c3120fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +0.1.1 +=============== + +* Fixed bug where 'db' commands broke due to template overhaul in 0.1.0 release. + 0.1.0 =============== diff --git a/commands/usage.help b/commands/usage.help index 93326356..53fcb74b 100755 --- a/commands/usage.help +++ b/commands/usage.help @@ -11,7 +11,7 @@ WARDEN_HEADER=' WARDEN_USAGE=$(cat <