From df2bc1e120e2de264e9ae6b2e11999707a74423e Mon Sep 17 00:00:00 2001
From: "totten@civicrm.org" <Tim Otten>
Date: Sat, 21 Jun 2014 04:42:10 -0700
Subject: [PATCH] distmaker - Reduce noise in dists/*.sh

Conflicts:
	distmaker/dists/l10n.sh
---
 distmaker/dists/joomla_php5.sh    |  2 --
 distmaker/dists/l10n.sh           | 15 +++------------
 distmaker/dists/wordpress_php5.sh |  2 --
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh
index 91ee8b92d0..cc47829411 100755
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -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
 
diff --git a/distmaker/dists/l10n.sh b/distmaker/dists/l10n.sh
index 37486cd096..9dc91e260d 100644
--- a/distmaker/dists/l10n.sh
+++ b/distmaker/dists/l10n.sh
@@ -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
diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh
index 22e04252bd..024ac2e6a8 100644
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -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
 
-- 
2.25.1