Fixing site mail

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index 0677c66ae200535586c316999a0dd35106365cba..dc469bc94c6720f22a43fabd7256ae49f7b0c0d4 100644 (file)
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -242,12 +242,16 @@ function drupal_install {
   # Site aliases
   aliases="$*"
 
+  # Other parameters
+  domain="`facter domain`"
+
   # Installation parameters
   drupal_user_input name        "$site"                    "Site name"
+  drupal_user_input site_email  "$site@$domain"            "Site email"
   drupal_user_input profile     "standard"                 "Installation profile"
   drupal_user_input locale      "pt_BR"                    "Installation language"
   drupal_user_input admin       "$site"                    "Admin user"
-  drupal_user_input admin_email "$admin@`facter domain`"   "Admin email"
+  drupal_user_input admin_email "$admin@$domain"           "Admin email"
 
   if [ -e "$BASE/drupal-$series/sites/$site" ]; then
     echo "Drupal $site already installed at $BASE/drupal-$series"
@@ -279,7 +283,7 @@ function drupal_install {
     echo "Creating symlinks..."
     cd $BASE/drupal-$series/sites
     ln -s $SITES/$site/drupal $site
-    ln -s $SITES/$site/drupal $site.`facter domain`
+    ln -s $SITES/$site/drupal $site.$domain
 
     for alias in $aliases; do
       ln -s $SITES/$site/drupal $alias
@@ -314,7 +318,7 @@ EOF
   (
   echo "Installing drupal $series for $site using $profile profile..."
   cd $BASE/drupal-$series/
-  drush site-install $profile --site-name="$name" --site-email="email" --locale=$locale \
+  drush site-install $profile --site-name="$name" --site-mail="$site_email" --locale=$locale \
     --uri="$site" --sites-subdir="$site" --account-name="$admin" --account-mail="$admin_email"
   )