Skip to content

Commit

Permalink
Update buildkit for use with new domain_email_address table
Browse files Browse the repository at this point in the history
  • Loading branch information
colemanw committed Feb 6, 2025
1 parent ec2a9d7 commit 107fe53
Show file tree
Hide file tree
Showing 29 changed files with 48 additions and 38 deletions.
2 changes: 1 addition & 1 deletion app/config/backdrop-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ backdrop_install
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/modules/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/civicrm.settings.php"
CIVI_FILES="${CMS_ROOT}/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/backdrop-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ backdrop_install
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/modules/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/civicrm.settings.php"
CIVI_FILES="${CMS_ROOT}/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/d8leg-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/d8prj-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/d8rec-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal-case/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ drupal_install

DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ drupal_install

DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ drupal_install

DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal-sym1/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ drupal_install

DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal-sym2/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ drupal_install

DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal10-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal10-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal10-dev/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal10-dod/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal11-dev/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal8-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal8-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal9-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal9-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal9-dev/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ popd >> /dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Drupal8"
GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
Expand Down
2 changes: 1 addition & 1 deletion app/config/joomla-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ popd >>/dev/null
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/administrator/components/com_civicrm/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/components/com_civicrm/civicrm.settings.php"
CIVI_ADMSETTINGS="${CMS_ROOT}/administrator/components/com_civicrm/civicrm.settings.php"
Expand Down
2 changes: 1 addition & 1 deletion app/config/standalone-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ amp_install
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/web/core"
CIVI_UF="Standalone"
CIVI_SETTINGS="${WEB_ROOT}/web/private/civicrm.settings.php"
Expand Down
2 changes: 1 addition & 1 deletion app/config/standalone-composer/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ amp_install
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/vendor/civicrm/civicrm-core"
CIVI_UF="Standalone"
CIVI_SETTINGS="${CMS_ROOT}/private/civicrm.settings.php"
Expand Down
2 changes: 1 addition & 1 deletion app/config/starterkit/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ amp_install

DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/profiles/civicrm_starterkit/modules/civicrm"
CIVI_SETTINGS="${WEB_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
CIVI_FILES="${WEB_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/wmff/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ drupal_install
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
CIVI_SETTINGS="${CMS_ROOT}/sites/default/civicrm.settings.php"
CIVI_FILES="${CMS_ROOT}/sites/default/files/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/wp-case/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ wp_install
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${WEB_ROOT}/wp-content/plugins/civicrm/civicrm"
CIVI_SETTINGS="${WEB_ROOT}/wp-content/uploads/civicrm/civicrm.settings.php"
CIVI_FILES="${WEB_ROOT}/wp-content/uploads/civicrm"
Expand Down
2 changes: 1 addition & 1 deletion app/config/wp-clean/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ wp_install
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/wp-content/plugins/civicrm/civicrm"

if [[ "$CIVI_VERSION" =~ ^4.[0123456](\.([0-9]|alpha|beta)+)?$ ]] ; then
Expand Down
2 changes: 1 addition & 1 deletion app/config/wp-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ wp_install
## Setup CiviCRM (config files, database tables)

CIVI_DOMAIN_NAME="Demonstrators Anonymous"
CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <[email protected]>"
CIVI_DOMAIN_EMAIL="[email protected]"
CIVI_CORE="${CMS_ROOT}/wp-content/plugins/civicrm/civicrm"

if [[ "$CIVI_VERSION" =~ ^4.[0123456](\.([0-9]|alpha|beta)+)?$ ]] ; then
Expand Down
30 changes: 20 additions & 10 deletions src/civibuild.lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -771,17 +771,27 @@ function civicrm_install_cv() {
###############################################################################
## Update the CiviCRM domain's name+email
function civicrm_update_domain() {
cvutil_assertvars civicrm_install CIVI_DOMAIN_NAME CIVI_DOMAIN_EMAIL
cvutil_php_nodbg amp sql -Ncivi --root="$CMS_ROOT" <<EOSQL
UPDATE civicrm_domain SET name = '$CIVI_DOMAIN_NAME';
SELECT @option_group_id := id
FROM civicrm_option_group n
WHERE name = 'from_email_address';
UPDATE civicrm_option_value
SET label = '$CIVI_DOMAIN_EMAIL'
WHERE option_group_id = @option_group_id
AND value = '1';
cvutil_assertvars civicrm_install CIVI_DOMAIN_NAME CIVI_DOMAIN_EMAIL CIVI_VERSION
## In 6.0 the from_email_address option group was moved to the civicrm_domain_email_address table
if civicrm_check_ver '<' 6.0.alpha1 ; then
cvutil_php_nodbg amp sql -Ncivi --root="$CMS_ROOT" <<EOSQL
UPDATE civicrm_domain SET name = '$CIVI_DOMAIN_NAME';
SELECT @option_group_id := id
FROM civicrm_option_group n
WHERE name = 'from_email_address';
UPDATE civicrm_option_value
SET label = '"$CIVI_DOMAIN_NAME" <$CIVI_DOMAIN_EMAIL>'
WHERE option_group_id = @option_group_id
AND value = '1';
EOSQL
else
cvutil_php_nodbg amp sql -Ncivi --root="$CMS_ROOT" <<EOSQL
UPDATE civicrm_domain SET name = '$CIVI_DOMAIN_NAME';
UPDATE civicrm_domain_email_address
SET email = '$CIVI_DOMAIN_EMAIL', display_name = '$CIVI_DOMAIN_NAME'
WHERE is_default = 1;
EOSQL
fi
}

###############################################################################
Expand Down

0 comments on commit 107fe53

Please sign in to comment.