Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-18-25-12

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

diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index f906729b9b4b0cd11c6268ac0d81bd46efc899e0..b8b5e9ec8a3d525ba77046547c6a65a28a17ec48 100755 (executable)
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -14,23 +14,13 @@ fi
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
-# checkout the right code revisions
-pushd "$DM_SOURCEDIR/drupal"
-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/..