Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Upgrade Commons to 1.3 thanks to patches submitted by @skwashd - @ome…

…ga8cc supports @buyaline (Albert)
  • Loading branch information...
commit 4973b35e0de1357fc081b3b6bf3d53ce4a3c81fc 1 parent 763c19c
@omega8cc authored
View
3  BARRACUDA.sh.txt
@@ -59,8 +59,9 @@ _DEBUG_MODE=NO
### and should be used **only** for testing!
###
### _AEGIR_VERSION=HEAD
+### _AEGIR_VERSION=0.4-boa-C
###
-_AEGIR_VERSION=0.4-boa-C
+_AEGIR_VERSION=HEAD
###----------------------------------------###
View
5 OCTOPUS.sh.txt
@@ -74,8 +74,9 @@ _DEBUG_MODE=NO
### and should be used **only** for testing!
###
### _AEGIR_VERSION=HEAD
+### _AEGIR_VERSION=0.4-boa-C
###
-_AEGIR_VERSION=0.4-boa-C
+_AEGIR_VERSION=HEAD
###----------------------------------------###
@@ -239,7 +240,7 @@ _DRUSH_FAMILY=3
## Distributions
_COCOMORE=cdc-6.20.12
-_COMMONS=6.x-1.2
+_COMMONS=6.x-1.3
_DRUPAL5=5.23.50
_DRUPAL7=drupal-7.0
_MANAGINGNEWS=1.2
View
2  README.txt
@@ -93,7 +93,7 @@ Octopus can install the platforms listed below:
Drupal 7.0 ------------------- http://drupal.org/drupal-7.0
Atrium 1.0-beta9 ------------- http://openatrium.com
Managing News 1.2 ------------ http://managingnews.com
- Drupal Commons 1.2 ----------- http://acquia.com/drupalcommons
+ Drupal Commons 1.3 ----------- http://acquia.com/drupalcommons
Acquia 6.20-svn (int) -------- http://bit.ly/acquiadrupal
OpenPublish 2.3.441 ---------- http://openpublishapp.com
OpenScholar 2.0-b8-3.1 ------- http://openscholar.harvard.edu
View
8 aegir/barracuda/AegirSetupC.sh.txt
@@ -648,8 +648,12 @@ if [ ! -d "$_CORE_DISTRO" ] ; then
cd $_CORE/drupal_commons-$_COMMONS
rm -f $_CORE/drupal_commons-$_COMMONS/*.txt
if [ $_COMMONS = "6.x-1.3" ] ; then
- sed -i "s/\$logo =/\/\/\$logo =/g" $_CORE/drupal_commons-$_COMMONS/profiles/drupal_commons/drupal_commons.profile
- sed -i "s/\$description /\/\/\$description /g" $_CORE/drupal_commons-$_COMMONS/profiles/drupal_commons/drupal_commons.profile
+ cd $_CORE/drupal_commons-$_COMMONS/profiles/drupal_commons
+ cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/commons-1045778-fix-aegir-installs.patch ./
+ cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/commons-1060250-aegir-infinite-loop.patch ./
+ patch -p1 < commons-1045778-fix-aegir-installs.patch &> /dev/null
+ mrun "sleep 2"
+ patch -p1 < commons-1060250-aegir-infinite-loop.patch &> /dev/null
fi
create_dirs
fi
View
6 aegir/patches/commons-1045778-fix-aegir-installs.patch
@@ -1,7 +1,7 @@
-diff --git a/docroot/profiles/drupal_commons/drupal_commons.profile b/docroot/profiles/drupal_commons/drupal_commons.profile
+diff --git a/drupal_commons.profile b/drupal_commons.profile
index 48f7a16..57b5089 100644
---- a/docroot/profiles/drupal_commons/drupal_commons.profile
-+++ b/docroot/profiles/drupal_commons/drupal_commons.profile
+--- a/drupal_commons.profile
++++ b/drupal_commons.profile
@@ -68,7 +68,7 @@ function drupal_commons_profile_modules() {
* language-specific profiles.
*/
View
6 aegir/patches/commons-1060250-aegir-infinite-loop.patch
@@ -1,7 +1,7 @@
-diff --git a/docroot/profiles/drupal_commons/drupal_commons.profile b/docroot/profiles/drupal_commons/drupal_commons.profile
+diff --git a/drupal_commons.profile b/drupal_commons.profile
index 57b5089..ae0ffbd 100644
---- a/docroot/profiles/drupal_commons/drupal_commons.profile
-+++ b/docroot/profiles/drupal_commons/drupal_commons.profile
+--- a/drupal_commons.profile
++++ b/drupal_commons.profile
@@ -116,7 +116,33 @@ function drupal_commons_profile_tasks(&$task, $url) {
// Provide a form to choose features
Please sign in to comment.
Something went wrong with that request. Please try again.