From: Perforce Review Daemon <p4review AT smee.org>
To: "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 80616 by Jason Flatt for review
Date: Tue, 13 Jun 2006 22:15:01 +0100 (BST)
Change 80616 by jason_flatt@jason-jason on 2006/06/13 22:14:59
Integrate MySQL database creation tweaks, and adding FINAL.
if [ "${DRUPAL_INSTALLED}" == "n" ]
then
- persistent_add DRUPAL_CREATEDB DRUPAL_CONFIGURE
&&
+ persistent_add DRUPAL_CREATEDB DRUPAL_CONFIGURE MYSQL_PASSWORD
&&
message "${MESSAGE_COLOR}The MySQL daemon needs to be running to create
the database${DEFAULT_COLOR}" &&
if query "Create the Drupal database?" n
then
- DRUPAL_CREATEDB="y"
+ 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. "
""
else
DRUPAL_CREATEDB="n"
fi
&&
@@ -1,9 +1,12 @@
2006-06-13 Jason Flatt <jflatt AT sourcemage.org>
* CONFIGURE: Added check for existing install that was in PREPARE.
+ Added a query for MySQL's root password.
* 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
settings.php file to take into account the two Drupal versions and
the two possible database choices.
+ Added the password to the MySQL database activities.
* PREPARE: Changed the order for version install so that the more
current version is the default.
Removed warning and automatic exit so spell will complete it's cast