Merge pull request #479 from colemanw/releaser

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

diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh
index 2e1afd7b182b07d72c6d24c4f368371e493c8547..1387c7dd5659b0203a70e604ca42352c4d9876be 100755 (executable)
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 # This script assumes
 # that DAOs are generated
@@ -59,7 +59,7 @@ set -e
 cp $SRC/agpl-3.0.txt $TRG
 cp $SRC/gpl.txt $TRG
 cp $SRC/README.txt $TRG
-cp $SRC/Sponsors.txt $TRG
+cp $SRC/CONTRIBUTORS.txt $TRG
 cp $SRC/agpl-3.0.exception.txt $TRG
 cp $SRC/civicrm.config.php $TRG
 
@@ -97,6 +97,9 @@ cp -r -p civicrm/joomla/admin/helpers/*          com_civicrm/admin/helpers
 cp -r -p civicrm/joomla/admin/plugins/*          com_civicrm/admin/plugins
 cp civicrm/joomla/admin/language/en-GB/*         com_civicrm/admin/language/en-GB
 
+# joomla 3.0 like admin.civicrm.php to be called civicrm.php
+# lets keep both versions there
+cp com_civicrm/admin/admin.civicrm.php com_civicrm/admin/civicrm.php
 
 # copying front end code
 cp civicrm/joomla/site/civicrm.html.php      com_civicrm/site