Do not ask some questions for 6.x installs

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index e3d9c25edce3e7d5c6c626a39181a5c9c3b87323..35bfca4013cccc41fb989e915b3e5e1222d51ee3 100644 (file)
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -320,13 +320,15 @@ function drupal_install {
   # 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@$domain"           "Admin email"
+  if [ "$series" != "6" ]; then
+    # 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@$domain"           "Admin email"
+  fi
 
   if [ -e "$BASE/drupal-$series/sites/$site" ]; then
     echo "Drupal $site already installed at $BASE/drupal-$series"