Merge pull request #2964 from freeform/CRM-14489

[civicrm-core.git] / distmaker / dists / wordpress_php5.sh

diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh
index 5e2cdbdbc760cfe7f919aba32c1e9a3529feb305..32c6c05f9d5907d3c2acfac8d21f455ae87863b1 100644 (file)
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 # This script assumes
 # that DAOs are generated
@@ -71,12 +71,13 @@ set -e
 for F in $SRC/WordPress/*; do
        cp $F $TRG/civicrm
 done
+rm -f $TRG/civicrm/civicrm.config.php.wordpress
 
 # copy docs
 cp $SRC/agpl-3.0.txt $TRG/civicrm/civicrm
 cp $SRC/gpl.txt $TRG/civicrm/civicrm
 cp $SRC/README.txt $TRG/civicrm/civicrm
-cp $SRC/civicrm.config.php $TRG/civicrm/civicrm
+cp $SRC/WordPress/civicrm.config.php.wordpress $TRG/civicrm/civicrm/civicrm.config.php
 
 # final touch
 echo "<?php