Skip to content

Commit

Permalink
Do not rely on ".DdevProjectConfig" containing the entire project con…
Browse files Browse the repository at this point in the history
…figuration
  • Loading branch information
martin-helmich committed Mar 12, 2024
1 parent 5719cbe commit 78cf45d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: mittwald
pre_install_actions:
- |
#ddev-nodisplay
if ( {{ contains "MITTWALD_API_TOKEN" (list .DdevGlobalConfig.web_environment | toString) }} || {{ contains "MITTWALD_API_TOKEN" (list .DdevProjectConfig.web_environment | toString) }} ); then
if ddev debug configyaml | grep -q MITTWALD_API_TOKEN ; then
echo "Using existing MITTWALD_API_TOKEN."
else
printf "\nPlease enter mittwald API token: "
Expand All @@ -15,7 +15,7 @@ pre_install_actions:
- |
#ddev-description:set mittwald API token
#ddev-nodisplay
if !( {{ contains "MITTWALD_API_TOKEN" (list .DdevGlobalConfig.web_environment | toString) }} || {{ contains "MITTWALD_API_TOKEN" (list .DdevProjectConfig.web_environment | toString) }} ); then
if ! ddev debug configyaml | grep -q MITTWALD_API_TOKEN ; then
token="${MITTWALD_API_TOKEN:-}"
if [[ -z "${token}" && -z "${DDEV_NONINTERACTIVE:-}" ]] ; then
read -s token
Expand All @@ -32,14 +32,14 @@ pre_install_actions:
- |
#ddev-nodisplay
if !( {{ contains "MITTWALD_APP_INSTALLATION_ID" (list .DdevProjectConfig.web_environment | toString) }} ); then
if ! ddev debug configyaml | grep -q MITTWALD_APP_INSTALLATION_ID ; then
printf "Please enter mittwald app installation ID (formatted a-XXXXXX): "
fi
- |
#ddev-description:set mittwald app installation ID
#ddev-nodisplay
if !( {{ contains "MITTWALD_APP_INSTALLATION_ID" (list .DdevProjectConfig.web_environment | toString) }} ); then
if ! ddev debug configyaml | grep -q MITTWALD_APP_INSTALLATION_ID ; then
app_id="${MITTWALD_APP_INSTALLATION_ID:-}"
if [[ -z "${app_id}" && -z "${DDEV_NONINTERACTIVE:-}" ]] ; then
read app_id
Expand Down

0 comments on commit 78cf45d

Please sign in to comment.