Merge pull request #17 from mlutfy/issue1-distmaker

Issue #1 again: sed on TRG directory, not DM_SOURCEDIR
CiviCRM42 · Jun 7, 2013 · 84c0e24 · 84c0e24
2 parents 296374b + 37af638
commit 84c0e24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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