From fa3796931f0c9018628a76fb0db0f50dc541894d Mon Sep 17 00:00:00 2001
From: "totten@civicrm.org" <Tim Otten>
Date: Sat, 21 Jun 2014 04:58:14 -0700
Subject: [PATCH] distmaker - Extract function dm_reset_dirs(). Reduce noise.

---
 distmaker/dists/common.sh         | 10 ++++++++++
 distmaker/dists/drupal6_php5.sh   | 10 +++-------
 distmaker/dists/drupal_php5.sh    |  9 +++------
 distmaker/dists/drupal_sk_php5.sh | 12 +++---------
 distmaker/dists/joomla_php5.sh    |  8 +++-----
 distmaker/dists/l10n.sh           |  4 +---
 distmaker/dists/wordpress_php5.sh | 10 ++++------
 7 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index 75f167dee2..340c7f45e6 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -1,5 +1,15 @@
 #!/bin/bash
 
+## Delete/create a dir
+## usage: dm_reset_dirs <path1> <path2> ...
+function dm_reset_dirs() {
+  for d in "$@" ; do
+    [ -d "$d" ] && rm -rf "$d"
+  done
+
+  mkdir -p "$@"
+}
+
 ## Copy files from one dir into another dir
 ## usage: dm_install_dir <from-dir> <to-dir>
 function dm_install_dir() {
diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh
index b3ee75c947..d961acdd35 100755
--- a/distmaker/dists/drupal6_php5.sh
+++ b/distmaker/dists/drupal6_php5.sh
@@ -20,18 +20,14 @@ git checkout .
 git checkout "$DM_REF_DRUPAL6"
 popd
 
-# make sure and clean up before
-[ -d $TRG ] && rm -rf $TRG/*
-
 # copy all the stuff
+dm_reset_dirs "$TRG"
+cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
+dm_generate_version "$TRG/civicrm-version.php" Drupal6
 dm_install_core "$SRC" "$TRG"
 dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
 
-# copy docs
-cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
-dm_generate_version "$TRG/civicrm-version.php" Drupal6
-
 # gen tarball
 cd $TRG/..
 tar czf $DM_TARGETDIR/civicrm-$DM_VERSION-drupal6.tar.gz civicrm
diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index f906729b9b..2eec1ec10c 100755
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -20,18 +20,15 @@ git checkout .
 git checkout "$DM_REF_DRUPAL"
 popd
 
-# make sure and clean up before
-[ -d $TRG ] && rm -rf $TRG/*
-
 # copy all the stuff
+dm_reset_dirs "$TRG"
+cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
+dm_generate_version "$TRG/civicrm-version.php" Drupal
 dm_install_core "$SRC" "$TRG"
 dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
 dm_install_drupal_info "$DM_SOURCEDIR/drupal"
 
-cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
-dm_generate_version "$TRG/civicrm-version.php" Drupal
-
 # gen tarball
 cd $TRG/..
 tar czf $DM_TARGETDIR/civicrm-$DM_VERSION-drupal.tar.gz civicrm
diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh
index 448d85cc7a..80b98dcdd6 100755
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -19,10 +19,10 @@ pushd "$DM_SOURCEDIR/drupal"
 git checkout "$DM_REF_DRUPAL"
 popd
 
-# make sure and clean up before
-[ -d $TRG ] && rm -rf $TRG/*
-
 # copy all the stuff
+dm_reset_dirs "$TRG"
+cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
+dm_generate_version "$TRG/civicrm-version.php" Drupal
 dm_install_core "$SRC" "$TRG"
 dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
@@ -34,12 +34,6 @@ rm -rf $TRG/packages/IDS
 rm -rf $TRG/packages/jquery
 rm -rf $TRG/packages/ckeditor
 rm -rf $TRG/packages/tinymce
-rm -rf $TRG/joomla
-rm -rf $TRG/WordPress
-
-# copy docs
-cp $SRC/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php
-dm_generate_version "$TRG/civicrm-version.php" Drupal
 
 # gen tarball
 cd $TRG/..
diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh
index cc47829411..fb67f8ed00 100755
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -19,15 +19,13 @@ pushd "$DM_SOURCEDIR/joomla"
 git checkout "$DM_REF_JOOMLA"
 popd
 
-# make sure and clean up before
-[ -d $TRG ] && rm -rf $TRG/*
-
 # copy all the rest of the stuff
+dm_reset_dirs "$TRG"
+cp $SRC/civicrm.config.php $TRG
+dm_generate_version "$TRG/civicrm-version.php" Joomla
 dm_install_core "$SRC" "$TRG"
 dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_joomla "$SRC/joomla" "$TRG/joomla"
-cp $SRC/civicrm.config.php $TRG
-dm_generate_version "$TRG/civicrm-version.php" Joomla
 
 # gen zip file
 cd $DM_TMPDIR;
diff --git a/distmaker/dists/l10n.sh b/distmaker/dists/l10n.sh
index 20439adfd1..5a08606868 100644
--- a/distmaker/dists/l10n.sh
+++ b/distmaker/dists/l10n.sh
@@ -14,10 +14,8 @@ fi
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
-# make sure and clean up before
-[ -d $TRG ] && rm -rf $TRG/*
-
 # copy all the stuff
+dm_reset_dirs "$TRG"
 dm_install_l10n "$SRC/l10n" "$TRG/l10n"
 
 [ ! -d $TRG/sql ] && mkdir $TRG/sql
diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh
index 024ac2e6a8..373d88d2d9 100644
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -19,19 +19,17 @@ pushd "$DM_SOURCEDIR/WordPress"
 git checkout "$DM_REF_WORDPRESS"
 popd
 
-# make sure and clean up before
-[ -d $TRG ] && rm -rf $TRG/*
-[ ! -d $TRG/civicrm/civicrm ] && mkdir -p $TRG/civicrm/civicrm
-
 # copy all the stuff
+dm_reset_dirs "$TRG" "$TRG/civicrm/civicrm"
+cp $SRC/WordPress/civicrm.config.php.wordpress $TRG/civicrm/civicrm/civicrm.config.php
+dm_generate_version "$TRG/civicrm/civicrm/civicrm-version.php" Wordpress
 dm_install_core "$SRC" "$TRG/civicrm/civicrm"
 dm_install_packages "$SRC/packages" "$TRG/civicrm/civicrm/packages"
 dm_install_wordpress "$SRC/WordPress" "$TRG/civicrm"
-cp $SRC/WordPress/civicrm.config.php.wordpress $TRG/civicrm/civicrm/civicrm.config.php
-dm_generate_version "$TRG/civicrm/civicrm/civicrm-version.php" Wordpress
 
 # gen tarball
 cd $TRG
 $DM_ZIP -r -9 $DM_TARGETDIR/civicrm-$DM_VERSION-wordpress.zip *
+
 # clean up
 rm -rf $TRG
-- 
2.25.1