Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 80595 by Jason Flatt for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 80595 by Jason Flatt for review
  • Date: Tue, 13 Jun 2006 15:45:01 +0100 (BST)

Change 80595 by jason_flatt@jason-jason on 2006/06/13 15:42:54

Integrate John Harding's version bump and mods and my install tweaks.

Affected files ...

... //sgl/grimoires/test/collab/drupal/DEPENDS#5 integrate
... //sgl/grimoires/test/collab/drupal/DETAILS#9 integrate
... //sgl/grimoires/test/collab/drupal/HISTORY#11 integrate
... //sgl/grimoires/test/collab/drupal/INSTALL#5 integrate
... //sgl/grimoires/test/collab/drupal/PREPARE#4 integrate
... //sgl/grimoires/test/collab/drupal/drupal-4.6.6.tar.gz.sig#2 delete

Differences ...

==== //sgl/grimoires/test/collab/drupal/DEPENDS#5 (xtext) ====

@@ -1,4 +1,4 @@
depends ${DRUPAL_DATABASE_ENGINE}
&&
-depends MAIL-TRANSPORT-AGENT
&&
+optional_depends MAIL-TRANSPORT-AGENT
&&
message "${MESSAGE_COLOR}${SPELL_COLOR}apache2${MESSAGE_COLOR} is
recommended${DEFAULT_COLOR}" &&
depends PHP

==== //sgl/grimoires/test/collab/drupal/DETAILS#9 (xtext) ====

@@ -1,11 +1,18 @@
SPELL=drupal
- VERSION=4.6.6
+if [[ "${DRUPAL_VER}" == "older" ]]
+ then
+ VERSION=4.6.8
+ SECURITY_PATCH=2
+
SOURCE_HASH=sha512:ef53f7da6c798d20c965a99e7907c7b05bc0f2bf1c09c633b8665f2cf7fb4a34fb44b6bf586f419b6637ad2b713f9188a4ec965c1e73dc1b31e6382f520fcc3b
+ else
+ VERSION=4.7.2
SECURITY_PATCH=2
+
SOURCE_HASH=sha512:6e9ef5912e6ac0cc982601aa3d3923ad7348ac094751b138ce2a153cb41acbab59b77b0ad0959067acb65b09fde527703011b1c889a3c90e968c253bc18be63c
+fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://drupal.org/files/projects/$SOURCE
WEB_SITE=http://www.drupal.org/
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
LICENSE[0]=GPL
BUILD_API=2
DOCS="*.txt"

==== //sgl/grimoires/test/collab/drupal/HISTORY#11 (text) ====

@@ -1,3 +1,17 @@
+2006-06-13 Jason Flatt <jflatt AT sourcemage.org>
+ * 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.
+ * PREPARE: Changed the order for version install so that the more
+ current version is the default.
+
+2006-06-08 John Harding <johnh AT kuberaconsulting.com>
+ * DETAILS: Security update, added if statement to allow choice between
+ 4.6.8 and 4.7.2 versions. Changed to SOURCE_HASH because I couldn't
get
+ my sig to work.
+ * DEPENDS: Made depends on MTA optional.
+ * PREPARE: Added query on which version to install.
+
2006-04-20 Jason Flatt <jflatt AT sourcemage.org>
* DETAILS: Re-added SOURCE_GPG as I was wrong about the previous
change.

==== //sgl/grimoires/test/collab/drupal/INSTALL#5 (xtext) ====

@@ -13,7 +13,17 @@
#
# Return true as this will fail if the database already exists
#
- mysql ${DRUPAL_DATABASE_NAME} < database/database.mysql || true
+ if [ "${DRUPAL_VER}" == "newer" ]; then
+ if [ "`mysql -V | cut -d" " -f6 | cut -d"." -f1`" > "4" ]
||
+ [ "`mysql -V | cut -d" " -f6 | cut -d"." -f1`" == "4" ]
&&
+ [ "`mysql -V | cut -d" " -f6 | cut -d"." -f2`" > "0" ];
then
+ mysql ${DRUPAL_DATABASE_NAME} < database/database.4.1.mysql
|| true
+ else
+ mysql ${DRUPAL_DATABASE_NAME} < database/database.4.0.mysql
|| true
+ fi
+ else
+ mysql ${DRUPAL_DATABASE_NAME} < database/database.mysql ||
true
+ fi
;;

postgresql)
@@ -35,10 +45,24 @@
if [ "${DRUPAL_CONFIGURE}" == "y" ]; then
# Update the sites/default/settings.php configuration file
# The database connection string
- sedit
"s|username:password@localhost/database|${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
&&
+ if [ "${DRUPAL_VER}" == "newer" ]; then
+ if [ "${DRUPAL_DATABASE_ENGINE}" == "mysql" ]; then
+ sedit "s|\$db_url =
'mysql://username:password@localhost/databasename';|\$db_url =
'mysql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}';|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ else
+ sedit "s|\$db_url =
'mysql://username:password@localhost/databasename';|\$db_url =
'pgsql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}';|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ fi
+ else
+ if [ "${DRUPAL_DATABASE_ENGINE}" == "mysql" ]; then
+ sedit "s|\$db_url =
'mysql://username:password@localhost/database';|\$db_url =
'mysql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}';|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ else
+ sedit "s|\$db_url =
'mysql://username:password@localhost/database';|\$db_url =
'pgsql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}/${DRUPAL_DATABASE_NAME}';|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ fi
+ fi
&&

- # The base URL string
- sedit "s|http://localhost|http://localhost/${SPELL}|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php &&
+ # The base URL string (this part can be removed when support for 4.6 is
removed)
+ if [ "${DRUPAL_VER}" == "older" ]; then
+ sedit "s|http://localhost|http://localhost/${SPELL}|"
${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/sites/default/settings.php
+ fi
&&

mkdir ${INSTALL_ROOT}/${DRUPAL_INSTALL_PATH}/${SPELL}/files
fi
&&

==== //sgl/grimoires/test/collab/drupal/PREPARE#4 (xtext) ====

@@ -1,4 +1,9 @@
-persistent_add DRUPAL_INSTALLED &&
+config_query_list DRUPAL_VER
\
+ "Do you wish to install the newer (4.7) or older (4.6)
version of Drupal (both are considered stable)?" \
+ "newer"
\
+ "older"
&&
+
+persistent_add DRUPAL_INSTALLED
&&
if spell_ok ${SPELL}
then
DRUPAL_INSTALLED="y"



  • [SM-Commit] PERFORCE change 80595 by Jason Flatt for review, Perforce Review Daemon, 06/13/2006

Archive powered by MHonArc 2.6.24.

Top of Page