change quotes to backticks

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

diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh
index 628bc84fce320ae25ada0ac5300886deb9c565d5..e115fc35fcd866e61c6c763f37c5e8e9c67973c7 100644 (file)
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -1,62 +1,32 @@
 #!/bin/bash
 set -ex
 
-# This script assumes
-# that DAOs are generated
-# and all the necessary conversions had place!
-
 P=`dirname $0`
 CFFILE=$P/../distmaker.conf
-
 if [ ! -f $CFFILE ] ; then
        echo "NO DISTMAKER.CONF FILE!"
        exit 1
 else
        . $CFFILE
 fi
-
 . "$P/common.sh"
 
 SRC=$DM_SOURCEDIR
 TRG=$DM_TMPDIR/civicrm
 
-# checkout the right code revisions
-pushd "$DM_SOURCEDIR/WordPress"
-git checkout "$DM_REF_WORDPRESS"
-popd
-
-# make sure and clean up before
-if [ -d $TRG ] ; then
-       rm -rf $TRG/*
-fi
-
-if [ ! -d $TRG ] ; then
-       mkdir $TRG
-fi
-
-if [ ! -d $TRG/civicrm ] ; then
-       mkdir $TRG/civicrm
-fi
-
-if [ ! -d $TRG/civicrm/civicrm ] ; then
-       mkdir $TRG/civicrm/civicrm
-fi
-
 # copy all the stuff
-dm_install_core "$SRC" "$TRG/civicrm/civicrm"
-dm_install_packages "$SRC/packages" "$TRG/civicrm/civicrm/packages"
-
-for F in $SRC/WordPress/*; do
-       cp $F $TRG/civicrm
-done
-rm -f $TRG/civicrm/civicrm.config.php.wordpress
-
-# copy docs
+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_vendor "$SRC/vendor" "$TRG/civicrm/civicrm/vendor"
+dm_install_bower "$SRC/bower_components" "$TRG/civicrm/civicrm/bower_components"
+dm_install_wordpress "$SRC/WordPress" "$TRG/civicrm"
 
 # gen tarball
 cd $TRG
-$DM_ZIP -r -9 $DM_TARGETDIR/civicrm-$DM_VERSION-wordpress.zip *
+${DM_ZIP:-zip} -r -9 $DM_TARGETDIR/civicrm-$DM_VERSION-wordpress.zip *
+
 # clean up
 rm -rf $TRG