summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Flatt2006-06-13 22:45:10 -0100
committerJason Flatt2006-06-13 22:45:10 -0100
commit49fff42f09d7ad29d08fea35c8e169c66c843f84 (patch)
treece0efb8ed1df0bd63346a0568ba6c8c03620fc35
parentc6b9b6979946d953bc6323293892c78137c334d3 (diff)
Forgot last time to recheck for MySQL root w/o a password.
-rwxr-xr-xcollab/drupal/CONFIGURE5
-rw-r--r--collab/drupal/HISTORY3
2 files changed, 6 insertions, 2 deletions
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