From b35c21aa41097983b6d6c080c397c38ac7c36a31 Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Fri, 7 Jun 2013 10:32:55 -0400 Subject: [PATCH 1/2] Issue #1: sed for drupal version must be done on DM_TARGETDIR, not DM_SOURCEDIR --- distmaker/dists/drupal6_php5.sh | 2 +- distmaker/dists/drupal_php5.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh index 515b006c..45ba0882 100644 --- a/distmaker/dists/drupal6_php5.sh +++ b/distmaker/dists/drupal6_php5.sh @@ -67,7 +67,7 @@ cp $SRC/agpl-3.0.exception.txt $TRG cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php # set full version in .info files -MODULE_DIRS=`find "$DM_SOURCEDIR/drupal" -type f -name "*.info"` +MODULE_DIRS=`find "$DM_TARGETDIR/drupal" -type f -name "*.info"` for INFO in $MODULE_DIRS; do sed -i "s/version = .*\$/version = $DM_VERSION/g" $INFO done diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh index dcaf2b69..08fc6b91 100644 --- a/distmaker/dists/drupal_php5.sh +++ b/distmaker/dists/drupal_php5.sh @@ -66,7 +66,7 @@ cp $SRC/agpl-3.0.exception.txt $TRG cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php # set full version in .info files -MODULE_DIRS=`find "$DM_SOURCEDIR/drupal" -type f -name "*.info"` +MODULE_DIRS=`find "$DM_TARGETDIR/drupal" -type f -name "*.info"` for INFO in $MODULE_DIRS; do sed -i "s/version = .*\$/version = $DM_VERSION/g" $INFO done From 03fbcd0b2b4207a9b0b1d0c7c460a46f4ee51262 Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Fri, 7 Jun 2013 10:53:21 -0400 Subject: [PATCH 2/2] Issue #1: sed for drupal version must be done on TRG, not DM_SOURCEDIR --- distmaker/dists/drupal6_php5.sh | 2 +- distmaker/dists/drupal_php5.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh index 515b006c..185a84dd 100644 --- a/distmaker/dists/drupal6_php5.sh +++ b/distmaker/dists/drupal6_php5.sh @@ -67,7 +67,7 @@ cp $SRC/agpl-3.0.exception.txt $TRG cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php # set full version in .info files -MODULE_DIRS=`find "$DM_SOURCEDIR/drupal" -type f -name "*.info"` +MODULE_DIRS=`find "$TRG/drupal" -type f -name "*.info"` for INFO in $MODULE_DIRS; do sed -i "s/version = .*\$/version = $DM_VERSION/g" $INFO done diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh index dcaf2b69..07c0a1bc 100644 --- a/distmaker/dists/drupal_php5.sh +++ b/distmaker/dists/drupal_php5.sh @@ -66,7 +66,7 @@ cp $SRC/agpl-3.0.exception.txt $TRG cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php # set full version in .info files -MODULE_DIRS=`find "$DM_SOURCEDIR/drupal" -type f -name "*.info"` +MODULE_DIRS=`find "$TRG/drupal" -type f -name "*.info"` for INFO in $MODULE_DIRS; do sed -i "s/version = .*\$/version = $DM_VERSION/g" $INFO done