Merge pull request #479 from colemanw/releaser

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

diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh
index 4b791c35985173a6b398a2285e8e07521f90af00..f6da93bd4c4aace8b4065d879df77d506ac4a389 100755 (executable)
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 # This script assumes
 # that DAOs are generated
@@ -15,11 +15,16 @@ else
        . $CFFILE
 fi
 
-RSYNCOPTIONS="-avC --exclude=svn --exclude=.git --exclude=_ORIGINAL_ --include=core"
+RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core"
 RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS"
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
+# checkout the right code revisions
+pushd "$DM_SOURCEDIR/drupal"
+git checkout "$DM_REF_DRUPAL"
+popd
+
 # make sure and clean up before
 if [ -d $TRG ] ; then
        rm -rf $TRG/*
@@ -65,7 +70,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/drupal/civicrm.config.php.drupal $TRG/civicrm.config.php