From e365b6e5f8a8d397d5c37331d7744dafbba20ae7 Mon Sep 17 00:00:00 2001
From: "totten@civicrm.org" <Tim Otten>
Date: Sat, 21 Jun 2014 04:15:00 -0700
Subject: [PATCH] distmaker - Remove dead code. Shift comments.

---
 distmaker/distmaker.sh            | 11 -----------
 distmaker/dists/common.sh         |  9 +++++++--
 distmaker/dists/drupal6_php5.sh   |  2 --
 distmaker/dists/drupal_php5.sh    |  2 --
 distmaker/dists/drupal_sk_php5.sh |  2 --
 distmaker/dists/joomla_php5.sh    |  2 --
 distmaker/dists/l10n.sh           |  2 --
 distmaker/dists/wordpress_php5.sh |  2 --
 8 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index 69e9b82d9f..407152a8b4 100755
--- a/distmaker/distmaker.sh
+++ b/distmaker/distmaker.sh
@@ -29,17 +29,6 @@ P=`dirname $0`
 # Current dir
 ORIGPWD=`pwd`
 
-# List of files to exclude from all tarballs
-DM_EXCLUDES=".git .svn packages/_ORIGINAL_ packages/SeleniumRC packages/PHPUnit packages/PhpDocumentor packages/SymfonyComponents packages/amavisd-new packages/git-footnote"
-for DM_EXCLUDE in $DM_EXCLUDES ; do
-  DM_EXCLUDES_RSYNC="--exclude=${DM_EXCLUDE} ${DM_EXCLUDES_RSYNC}"
-done
-## Note: These small folders have items that previously were not published,
-## but there's no real cost to including them, and excluding them seems
-## likely to cause confusion as the codebase evolves:
-##   packages/Files packages/PHP packages/Text
-export DM_EXCLUDES DM_EXCLUDES_RSYNC
-
 # Set no actions by default
 D5PACK=0
 D56PACK=0
diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index c9a0687e9e..3f3dec42b5 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -9,7 +9,7 @@ function dm_install_dir() {
   if [ ! -d "$to" ]; then
     mkdir -p "$to"
   fi
-  rsync -avC --exclude=.git --exclude=.svn "$from/./"  "$to/./"
+  $DM_RSYNC -avC --exclude=.git --exclude=.svn "$from/./"  "$to/./"
 }
 
 ## Copy listed files
@@ -75,8 +75,13 @@ function dm_install_packages() {
     excludes_rsync="--exclude=${exclude} ${excludes_rsync}"
   done
 
+  ## Note: These small folders have items that previously were not published,
+  ## but there's no real cost to including them, and excluding them seems
+  ## likely to cause confusion as the codebase evolves:
+  ##   packages/Files packages/PHP packages/Text
+
   [ ! -d "$to" ] && mkdir "$to"
-  rsync -avC $excludes_rsync --include=core "$repo/./" "$to/./"
+  $DM_RSYNC -avC $excludes_rsync --include=core "$repo/./" "$to/./"
 }
 
 ## Copy Drupal-integration module
diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh
index 8ccec51bfb..84cc6af47e 100755
--- a/distmaker/dists/drupal6_php5.sh
+++ b/distmaker/dists/drupal6_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
-RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index c656c86814..fcea936466 100755
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
-RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh
index b1c6ee2c6a..de8a3b945e 100755
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
-RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh
index 50994a5302..620ae6cc55 100755
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
-RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
diff --git a/distmaker/dists/l10n.sh b/distmaker/dists/l10n.sh
index 6666b31baa..7106101f53 100644
--- a/distmaker/dists/l10n.sh
+++ b/distmaker/dists/l10n.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
-RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh
index ddb19bf99c..628bc84fce 100644
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -17,8 +17,6 @@ fi
 
 . "$P/common.sh"
 
-RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
-RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
-- 
2.25.1