From 784ab2f0f8896d51fa68f96148a57cc5fb03ada2 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 27 Feb 2020 08:55:14 +1100 Subject: [PATCH] dev/core#1615 Update distmaker to handle the fact civicrm-setup is now in core --- distmaker/dists/common.sh | 2 +- distmaker/dists/wordpress_php5.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh index c288a21086..cd7e4ecf2a 100644 --- a/distmaker/dists/common.sh +++ b/distmaker/dists/common.sh @@ -65,7 +65,7 @@ function dm_install_core() { local repo="$1" local to="$2" - for dir in ang css i js PEAR templates bin CRM api extern Reports install settings Civi partials release-notes xml ; do + for dir in ang css i js PEAR templates bin CRM api extern Reports install settings Civi partials release-notes xml setup ; do [ -d "$repo/$dir" ] && dm_install_dir "$repo/$dir" "$to/$dir" done diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh index ee0628e376..2cc04c5556 100644 --- a/distmaker/dists/wordpress_php5.sh +++ b/distmaker/dists/wordpress_php5.sh @@ -31,7 +31,7 @@ ${DM_ZIP:-zip} -r -9 $DM_TARGETDIR/civicrm-$DM_VERSION-wordpress.zip * # gen wporg tarball touch "$TRG/civicrm/civicrm/.use-civicrm-setup" -cp "$TRG/civicrm/civicrm/vendor/civicrm/civicrm-setup/plugins/blocks/opt-in.disabled.php" "$TRG/civicrm/civicrm/vendor/civicrm/civicrm-setup/plugins/blocks/opt-in.civi-setup.php" +cp "$TRG/civicrm/civicrm/setup/plugins/blocks/opt-in.disabled.php" "$TRG/civicrm/civicrm/setup/plugins/blocks/opt-in.civi-setup.php" cd "$TRG" ${DM_ZIP:-zip} -r -9 $DM_TARGETDIR/civicrm-$DM_VERSION-wporg.zip * -- 2.25.1