From c4f1d7e464be9f3e98a9375f9ac3adf665c1a898 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 26 Feb 2020 18:01:08 -0800 Subject: [PATCH] dev/financial#84 - Update distmaker to include sequentialcreditnotes --- distmaker/dists/backdrop_php5.sh | 1 + distmaker/dists/common.sh | 20 ++++++++++++++++++++ distmaker/dists/drupal6_php5.sh | 1 + distmaker/dists/drupal7_dir_php5.sh | 1 + distmaker/dists/drupal_php5.sh | 1 + distmaker/dists/drupal_sk_php5.sh | 1 + distmaker/dists/joomla_php5.sh | 1 + distmaker/dists/wordpress_php5.sh | 1 + 8 files changed, 27 insertions(+) diff --git a/distmaker/dists/backdrop_php5.sh b/distmaker/dists/backdrop_php5.sh index 4288253c8f..65d8fb899d 100644 --- a/distmaker/dists/backdrop_php5.sh +++ b/distmaker/dists/backdrop_php5.sh @@ -19,6 +19,7 @@ dm_reset_dirs "$TRG" cp $SRC/backdrop/civicrm.config.php.backdrop $TRG/civicrm.config.php dm_generate_version "$TRG/civicrm-version.php" Backdrop dm_install_core "$SRC" "$TRG" +dm_install_coreext "$SRC" "$TRG" $(dm_core_exts) dm_install_packages "$SRC/packages" "$TRG/packages" dm_install_vendor "$SRC/vendor" "$TRG/vendor" dm_install_bower "$SRC/bower_components" "$TRG/bower_components" diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh index cd7e4ecf2a..967616eba5 100644 --- a/distmaker/dists/common.sh +++ b/distmaker/dists/common.sh @@ -89,6 +89,26 @@ function dm_install_core() { set -e } +## Copy built-in extensions +## usage: dm_install_core +function dm_install_coreext() { + local repo="$1" + local to="$2" + shift + shift + + for relext in "$@" ; do + [ ! -d "$to/$relext" ] && mkdir -p "$to/$relext" + ${DM_RSYNC:-rsync} -avC $excludes_rsync --include=core "$repo/$relext/./" "$to/$relext/./" + done +} + +## Get a list of default/core extension directories (space-delimited) +## reldirs=$(dm_core_exts) +function dm_core_exts() { + echo ext/sequentialcreditnotes +} + ## Copy all packages ## usage: dm_install_packages function dm_install_packages() { diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh index f3d4ba33a5..2ecb1a2b14 100755 --- a/distmaker/dists/drupal6_php5.sh +++ b/distmaker/dists/drupal6_php5.sh @@ -19,6 +19,7 @@ dm_reset_dirs "$TRG" cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php dm_generate_version "$TRG/civicrm-version.php" Drupal6 dm_install_core "$SRC" "$TRG" +dm_install_coreext "$SRC" "$TRG" $(dm_core_exts) dm_install_packages "$SRC/packages" "$TRG/packages" dm_install_vendor "$SRC/vendor" "$TRG/vendor" dm_install_bower "$SRC/bower_components" "$TRG/bower_components" diff --git a/distmaker/dists/drupal7_dir_php5.sh b/distmaker/dists/drupal7_dir_php5.sh index 8d50524a32..b7ade096c1 100644 --- a/distmaker/dists/drupal7_dir_php5.sh +++ b/distmaker/dists/drupal7_dir_php5.sh @@ -26,6 +26,7 @@ dm_reset_dirs "$TRG" cp $DM_DRUPALDIR/civicrm.config.php.drupal $TRG/civicrm.config.php dm_generate_version "$TRG/civicrm-version.php" Drupal dm_install_core "$SRC" "$TRG" +dm_install_coreext "$SRC" "$TRG" $(dm_core_exts) dm_install_packages $DM_PACKAGESDIR "$TRG/packages" dm_install_vendor "$SRC/vendor" "$TRG/vendor" dm_install_bower "$SRC/bower_components" "$TRG/bower_components" diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh index f34db2803a..7245be3fe8 100755 --- a/distmaker/dists/drupal_php5.sh +++ b/distmaker/dists/drupal_php5.sh @@ -19,6 +19,7 @@ dm_reset_dirs "$TRG" cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php dm_generate_version "$TRG/civicrm-version.php" Drupal dm_install_core "$SRC" "$TRG" +dm_install_coreext "$SRC" "$TRG" $(dm_core_exts) dm_install_packages "$SRC/packages" "$TRG/packages" dm_install_vendor "$SRC/vendor" "$TRG/vendor" dm_install_bower "$SRC/bower_components" "$TRG/bower_components" diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh index 3fb36905fd..b375d2ad28 100755 --- a/distmaker/dists/drupal_sk_php5.sh +++ b/distmaker/dists/drupal_sk_php5.sh @@ -19,6 +19,7 @@ dm_reset_dirs "$TRG" cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php dm_generate_version "$TRG/civicrm-version.php" Drupal dm_install_core "$SRC" "$TRG" +dm_install_coreext "$SRC" "$TRG" $(dm_core_exts) dm_install_packages "$SRC/packages" "$TRG/packages" dm_install_vendor "$SRC/vendor" "$TRG/vendor" dm_install_bower "$SRC/bower_components" "$TRG/bower_components" diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh index 65b342cefa..80ff9840cc 100755 --- a/distmaker/dists/joomla_php5.sh +++ b/distmaker/dists/joomla_php5.sh @@ -19,6 +19,7 @@ dm_reset_dirs "$TRG" "$DM_TMPDIR/com_civicrm" cp $SRC/civicrm.config.php $TRG dm_generate_version "$TRG/civicrm-version.php" Joomla dm_install_core "$SRC" "$TRG" +dm_install_coreext "$SRC" "$TRG" $(dm_core_exts) dm_install_packages "$SRC/packages" "$TRG/packages" dm_install_vendor "$SRC/vendor" "$TRG/vendor" dm_install_bower "$SRC/bower_components" "$TRG/bower_components" diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh index 2cc04c5556..0ab4ab7526 100644 --- a/distmaker/dists/wordpress_php5.sh +++ b/distmaker/dists/wordpress_php5.sh @@ -19,6 +19,7 @@ dm_reset_dirs "$TRG" "$TRG/civicrm/civicrm" cp $SRC/WordPress/civicrm.config.php.wordpress $TRG/civicrm/civicrm/civicrm.config.php dm_generate_version "$TRG/civicrm/civicrm/civicrm-version.php" Wordpress dm_install_core "$SRC" "$TRG/civicrm/civicrm" +dm_install_coreext "$SRC" "$TRG/civicrm/civicrm" $(dm_core_exts) dm_install_packages "$SRC/packages" "$TRG/civicrm/civicrm/packages" dm_install_vendor "$SRC/vendor" "$TRG/civicrm/civicrm/vendor" dm_install_bower "$SRC/bower_components" "$TRG/civicrm/civicrm/bower_components" -- 2.25.1