Misc fixes

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index 826059c2940854931e4b3caad683484bcc30fcf2..92dff75c61a7651d96bd103bdf69e3682886617e 100644 (file)
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -15,7 +15,7 @@ function drupal_user_input {
   shift 2
 
   if echo $param | grep -q 'passwd'; then
-    read -reps "$* (defaults to $default): " input
+    read -s -rep "$* (defaults to $default): " input
   else
     read -rep "$* (defaults to $default): " input
   fi
@@ -279,14 +279,14 @@ function drupal_install {
   )
 
   # Installation parameters
-  drupal_user_input profile     "Installation profile"  "standard"
-  drupal_user_input locale      "Installation language" "pt_BR"
-  drupal_user_input admin       "Admin user"            "$site"
-  drupal_user_input admin_email "Admin email"           "$site@`facter domain`"
-  drupal_user_input name        "Site name"             "$site"
-  drupal_user_input dbname      "Database name"         "$site"
-  drupal_user_input dbuser      "Database user"         "$site"
-  drupal_user_input dbpasswd    "Database passwd"       "$site"
+  drupal_user_input name        "$site"                    "Site name"
+  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 "$site@`facter domain`"    "Admin email"
+  drupal_user_input dbname      "$site"                    "Database name"
+  drupal_user_input dbuser      "$site"                    "Database user"
+  drupal_user_input dbpasswd    "$site"                    "Database passwd"
 
   echo "Configuring settings.php"
   if [ "$series" == "7" ]; then
@@ -299,11 +299,11 @@ function drupal_install {
 'host'     => 'localhost',
 'prefix'   => '',
 );
-    EOF
+EOF
   elif [ "$series" == "6" ]; then
     cat >> $SITES/$site/drupal/settings.php <<-EOF
 \$db_url = 'mysql://$dbuser:$dbpasswd@localhost/$dbname';
-    EOF
+EOF
   fi
 
   (