smgl/grimoire/grimoire-p4_history.git - pre-git grimoire history

diff --git a/collab/drupal/CONFIGURE b/collab/drupal/CONFIGURE
index 8369d24c28..93ccf42604 100755
--- a/collab/drupal/CONFIGURE
+++ b/collab/drupal/CONFIGURE

@@ -24,7 +24,10 @@ then

if query "Create the Drupal database?" n

then

DRUPAL_CREATEDB="y" &&

- query_string MYSQL_PASSWORD "What is the MySQL password for root (needed to create the database)? If there is no password, just press enter. " ""

+ if query "Do you need a password to create a database w/MySQL?" y

+ then

+ query_string MYSQL_PASSWORD "What is the MySQL password for root (needed to create the database)? If there is no password, just press enter. " ""

+ fi

else

DRUPAL_CREATEDB="n"

fi &&

diff --git a/collab/drupal/HISTORY b/collab/drupal/HISTORY
index d6ffa78253..05a82322be 100644
--- a/collab/drupal/HISTORY
+++ b/collab/drupal/HISTORY

@@ -1,6 +1,7 @@

2006年06月13日 Jason Flatt <jflatt@sourcemage.org>

* CONFIGURE: Added check for existing install that was in PREPARE.

- Added a query for MySQL's root password.

+ Added a query for MySQL's root password (and a check if it's needed

+ or not).

* FINAL: Added check for Drupal version before displaying message.

Added persistent_remove to not keep the MySQL password lying around.

* INSTALL: Modified the parts that create the database and modify the