distmaker - Reduce noise in dists/*.sh
authortotten@civicrm.org <Tim Otten>
Sat, 21 Jun 2014 11:42:10 +0000 (04:42 -0700)
committertotten@civicrm.org <Tim Otten>
Sun, 22 Jun 2014 07:57:13 +0000 (00:57 -0700)
Conflicts:
distmaker/dists/l10n.sh

distmaker/dists/joomla_php5.sh
distmaker/dists/l10n.sh
distmaker/dists/wordpress_php5.sh

index 91ee8b92d02ac6b3004f00b2d7c754acb4dc11e0..cc47829411037cff0f2d6faffadc0710b1beb647 100755 (executable)
@@ -26,8 +26,6 @@ popd
 dm_install_core "$SRC" "$TRG"
 dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_joomla "$SRC/joomla" "$TRG/joomla"
-
-# copy docs
 cp $SRC/civicrm.config.php $TRG
 dm_generate_version "$TRG/civicrm-version.php" Joomla
 
index 37486cd096ab27af1cee086c4e3969684144f2e7..9dc91e260ddb32b0d6124fc27541b56f5396b6a5 100644 (file)
@@ -19,23 +19,14 @@ TRG=$DM_TMPDIR/civicrm
 
 # copy all the stuff
 dm_install_l10n "$SRC/l10n" "$TRG/l10n"
+dm_install_files "$SRC" "$TRG" {agpl-3.0,agpl-3.0.exception,gpl,README,CONTRIBUTORS}.txt
 
 # copy selected sqls
-if [ ! -d $TRG/sql ] ; then
-       mkdir $TRG/sql
-fi
-
-for F in $SRC/sql/civicrm*.mysql $SRC/sql/counties.US.sql.gz $SRC/sql/case_sample*.mysql; do
+[ ! -d $TRG/sql ] && mkdir $TRG/sql
+for F in $SRC/sql/civicrm*.mysql $SRC/sql/case_sample*.mysql; do
        cp $F $TRG/sql
 done
 
-# copy docs
-cp $SRC/agpl-3.0.txt $TRG
-cp $SRC/gpl.txt $TRG
-cp $SRC/README.txt $TRG
-cp $SRC/CONTRIBUTORS.txt $TRG
-cp $SRC/agpl-3.0.exception.txt $TRG
-
 # gen tarball
 cd $TRG/..
 tar czf $DM_TARGETDIR/civicrm-$DM_VERSION-l10n.tar.gz --exclude '*.po' --exclude pot civicrm/l10n civicrm/sql/civicrm_*.??_??.mysql
index 22e04252bd7f18a882532fd052c9dee34f7f208e..024ac2e6a84ee7ea4a72adca46cb20e655fab5bb 100644 (file)
@@ -27,8 +27,6 @@ popd
 dm_install_core "$SRC" "$TRG/civicrm/civicrm"
 dm_install_packages "$SRC/packages" "$TRG/civicrm/civicrm/packages"
 dm_install_wordpress "$SRC/WordPress" "$TRG/civicrm"
-
-# copy docs
 cp $SRC/WordPress/civicrm.config.php.wordpress $TRG/civicrm/civicrm/civicrm.config.php
 dm_generate_version "$TRG/civicrm/civicrm/civicrm-version.php" Wordpress