X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tools%2Fscripts%2Fmk-drupal-test-site;h=d567c371573df67b437afbd623c45ffdd4fd4dad;hb=a953e3e44d504c65ced19fac8c7ab8087d5f2072;hp=dd9920d366f42d87ed66d5a8d39eebaf9e582d1f;hpb=4aaa541928433ced6cda522753e1f114d0ddf0ef;p=civicrm-core.git

diff --git a/tools/scripts/mk-drupal-test-site b/tools/scripts/mk-drupal-test-site
index dd9920d366..d567c37157 100755
--- a/tools/scripts/mk-drupal-test-site
+++ b/tools/scripts/mk-drupal-test-site
@@ -89,7 +89,7 @@ fi
 
 # NB: Avoid sending e-mails for the site installation
 # On hosts without sendmail (ex: demo sites), this causes the installation to fail.
-php -d sendmail_path=`which true` `which drush` site-install -y \
+drush site-install -y \
   --db-url="mysql://${DB_USER}:${DB_PASS}@${DB_HOST}/${DB_NAME}" \
   --account-name="$ADMIN_USER" \
   --account-pass="$ADMIN_PASS" \
@@ -110,9 +110,9 @@ for SUBDIR in modules files files/civicrm files/civicrm/templates_c ; do
   fi
 done
 
-ln -s "$CIVI_ROOT" "sites/$SITE_URL/modules/"
+ln -s "$CIVI_ROOT" "sites/$SITE_URL/modules/civicrm"
 
-cat "$CIVI_ROOT/templates/CRM/common/civicrm.settings.php.tpl" \
+cat "$CIVI_ROOT/templates/CRM/common/civicrm.settings.php.template" \
   | sed "s;%%baseURL%%;http://${SITE_URL};" \
   | sed "s;%%cms%%;Drupal;" \
   | sed "s;%%CMSdbHost%%;${DB_HOST};" \
@@ -135,13 +135,14 @@ popd
 ## Create CiviCRM config
 cat > "$CIVI_ROOT/bin/setup.conf" << EOF
   SVNROOT="$CIVI_ROOT"
+  CIVISOURCEDIR="$CIVI_ROOT"
   SCHEMA=schema/Schema.xml
   DBNAME="$DB_NAME"
   DBUSER="$DB_USER"
   DBPASS="$DB_PASS"
   DBARGS=""
   PHP5PATH=
-  DBLOAD=
+  DBLOAD="$DBLOAD"
   # DBADD=
 EOF
 
@@ -179,12 +180,12 @@ popd
 
 if [ -n "$SQL_DUMP" ]; then
   echo "Importing SQL dump: $SQL_DUMP"
-  mysql $DB_NAME < $SQL_DUMP
+  mysql $DB_NAME < "$SQL_DUMP"
   echo "SQL import complete."
 
   if [ -n "$SQL_DUMP2" -a -f "$SQL_DUMP2" ]; then
     echo "Importing SQL dump: $SQL_DUMP2"
-    mysql $DB_NAME < $SQL_DUMP2
+    mysql $DB_NAME < "$SQL_DUMP2"
     echo "SQL import complete."
   fi
 else