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

diff --git a/collab/drupal/DEPENDS b/collab/drupal/DEPENDS
index 7fadc8a3bb..499b70b774 100755
--- a/collab/drupal/DEPENDS
+++ b/collab/drupal/DEPENDS

@@ -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

diff --git a/collab/drupal/DETAILS b/collab/drupal/DETAILS
index 229d457881..cbeb27c6b4 100755
--- a/collab/drupal/DETAILS
+++ b/collab/drupal/DETAILS

@@ -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"

diff --git a/collab/drupal/HISTORY b/collab/drupal/HISTORY
index 840e84ee61..70b590e5ea 100644
--- a/collab/drupal/HISTORY
+++ b/collab/drupal/HISTORY

@@ -1,3 +1,17 @@

+2006年06月13日 Jason Flatt <jflatt@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@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@sourcemage.org>

* DETAILS: Re-added SOURCE_GPG as I was wrong about the previous

change.

diff --git a/collab/drupal/INSTALL b/collab/drupal/INSTALL
index 2d686c4bd7..ce4a894f1c 100755
--- a/collab/drupal/INSTALL
+++ b/collab/drupal/INSTALL

@@ -13,7 +13,17 @@ if [ "${DRUPAL_INSTALLED}" == "n" ]; then

#

# 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_INSTALLED}" == "n" ]; then

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 &&

diff --git a/collab/drupal/PREPARE b/collab/drupal/PREPARE
index 7fd257f550..7bcd55d835 100755
--- a/collab/drupal/PREPARE
+++ b/collab/drupal/PREPARE

@@ -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"

diff --git a/collab/drupal/drupal-4.6.6.tar.gz.sig b/collab/drupal/drupal-4.6.6.tar.gz.sig
deleted file mode 100644
index 418289eb94..0000000000
--- a/collab/drupal/drupal-4.6.6.tar.gz.sig
+++ /dev/null