Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

We no longer use _DRUSH_FAMILY for anything.

  • Loading branch information...
commit 49e6517123e9f9592be3938e5d5c77a8b1812836 1 parent 75383d4
@omega8cc authored
View
15 BARRACUDA.sh.txt
@@ -882,7 +882,6 @@ _INSTALLER_VERSION=BOA-2.0.6-dev
_APC_VERSION=3.1.13
_BZR_VERSION=2.3.4
_CHIVE_VERSION=1.2
-_DRUSH_FAMILY=4
_DRUSH_VERSION=4.6-dev
_GEOS_VERSION=3.3.7
_GIT_VERSION=1.8.1.3
@@ -897,7 +896,6 @@ _PURE_FTPD_VERSION=1.0.36
_REDIS_VERSION=2.6.11
if [ "$_USE_STOCK" = "YES" ] ; then
_DRUSH_VERSION=7.x-5.8
- _DRUSH_FAMILY=5
fi
###
@@ -3159,7 +3157,6 @@ upgrade_aegir_master () {
sed -i "s/EDIT_BOA_REPO_NAME/$_BOA_REPO_NAME/g" /var/aegir/AegirUpgrade.sh.txt &> /dev/null
sed -i "s/EDIT_DEBUG_MODE/$_DEBUG_MODE/g" /var/aegir/AegirUpgrade.sh.txt &> /dev/null
sed -i "s/EDIT_DOMAIN/$_THIS_FRONT/g" /var/aegir/AegirUpgrade.sh.txt &> /dev/null
- sed -i "s/EDIT_DRUSH_FAMILY/$_DRUSH_FAMILY/g" /var/aegir/AegirUpgrade.sh.txt &> /dev/null
sed -i "s/EDIT_DRUSH_VERSION/$_DRUSH_VERSION/g" /var/aegir/AegirUpgrade.sh.txt &> /dev/null
sed -i "s/EDIT_FROM_SOURCES/$_FROM_SOURCES/g" /var/aegir/AegirUpgrade.sh.txt &> /dev/null
sed -i "s/EDIT_HTTP_WILDCARD/$_HTTP_WILDCARD/g" /var/aegir/AegirUpgrade.sh.txt &> /dev/null
@@ -3212,12 +3209,6 @@ upgrade_aegir_master () {
sed -i "s/3600/$_SPEED_VALID_MAX/g" /var/aegir/config/includes/global.inc &> /dev/null
update_redis_password
force_advanced_nginx_config
- if [ "$_DRUSH_FAMILY" = "3" ] ; then
- cd /var/aegir/drush
- cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/user.drush.inc.patch ./
- patch -p0 < user.drush.inc.patch &> /dev/null
- chown -R aegir:aegir /var/aegir/drush &> /dev/null
- fi
if [ "$_DRUSH_VERSION" = "7.x-4.5" ] || [ "$_DRUSH_VERSION" = "4.6-dev" ] ; then
sed -i "s/which one she wants./which one she wants.\n chdir(\$request['base_project_path'])\;/g" /var/aegir/drush/commands/pm/package_handler/wget.inc &> /dev/null
fi
@@ -5785,7 +5776,6 @@ if [ "$_STATUS" = "INIT" ] ; then
sed -i "s/EDIT_AEGIR_VERSION/$_AEGIR_VERSION/g" $Files &> /dev/null
sed -i "s/EDIT_BOA_REPO_GIT_URL/$_BOA_REPO_GIT_URLX/g" $Files &> /dev/null
sed -i "s/EDIT_BOA_REPO_NAME/$_BOA_REPO_NAME/g" $Files &> /dev/null
- sed -i "s/EDIT_DRUSH_FAMILY/$_DRUSH_FAMILY/g" $Files &> /dev/null
sed -i "s/EDIT_DRUSH_VERSION/$_DRUSH_VERSION/g" $Files &> /dev/null
sed -i "s/EDIT_FROM_SOURCES/$_FROM_SOURCES/g" $Files &> /dev/null
sed -i "s/EDIT_PHP_CLI_VERSION/$_PHP_CLI_VERSION/g" $Files &> /dev/null
@@ -5864,11 +5854,6 @@ if [ "$_STATUS" = "INIT" ] ; then
sed -i "s/3600/$_SPEED_VALID_MAX/g" /var/aegir/config/includes/global.inc &> /dev/null
update_redis_password
force_advanced_nginx_config
- if [ "$_DRUSH_FAMILY" = "3" ] ; then
- cd /var/aegir/drush
- patch -p0 < /opt/tmp/$_BOA_REPO_NAME/aegir/patches/user.drush.inc.patch &> /dev/null
- chown -R aegir:aegir /var/aegir/drush &> /dev/null
- fi
if [ "$_DRUSH_VERSION" = "7.x-4.5" ] || [ "$_DRUSH_VERSION" = "4.6-dev" ] ; then
sed -i "s/which one she wants./which one she wants.\n chdir(\$request['base_project_path'])\;/g" /var/aegir/drush/commands/pm/package_handler/wget.inc &> /dev/null
fi
View
3  OCTOPUS.sh.txt
@@ -494,7 +494,6 @@ _INSTALLER_VERSION=BOA-2.0.6-dev
###
### Variables
###
-_DRUSH_FAMILY=4
_DRUSH_VERSION=4.6-dev
_NOW=`date +%y%m%d-%H%M`
_PLATFORMS_ONLY=NO
@@ -514,7 +513,6 @@ if [ -n "${STY+x}" ]; then
fi
if [ "$_USE_STOCK" = "YES" ] ; then
_DRUSH_VERSION=7.x-5.8
- _DRUSH_FAMILY=5
fi
###
@@ -873,7 +871,6 @@ do
sed -i "s/EDIT_DRUPAL7/$_DRUPAL7/g" $Files &> /dev/null
sed -i "s/EDIT_DRUPAL8/$_DRUPAL8/g" $Files &> /dev/null
sed -i "s/EDIT_DRUSH_CC_REQ/$_DRUSH_CC_REQ/g" $Files &> /dev/null
- sed -i "s/EDIT_DRUSH_FAMILY/$_DRUSH_FAMILY/g" $Files &> /dev/null
sed -i "s/EDIT_DRUSH_VERSION/$_DRUSH_VERSION/g" $Files &> /dev/null
sed -i "s/EDIT_ELMS/$_ELMS/g" $Files &> /dev/null
sed -i "s/EDIT_HM_DISTRO/$_HM_DISTRO/g" $Files &> /dev/null
View
1  aegir/scripts/AegirSetupA.sh.txt
@@ -98,7 +98,6 @@ _DEBUG_MODE=EDIT_DEBUG_MODE
_DIST_INSTALL=NO
_DISTRO=EDIT_DISTRO
_DOMAIN=EDIT_DOMAIN
-_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION
_HM_DISTRO=EDIT_HM_DISTRO
_HM_ONLY=EDIT_HM_ONLY
View
15 aegir/scripts/AegirSetupB.sh.txt
@@ -94,7 +94,6 @@ _DEBUG_MODE=EDIT_DEBUG_MODE
_DISTRO=EDIT_DISTRO
_DOMAIN=EDIT_DOMAIN
_DRUSH_CC_REQ=NO
-_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION
_HM_DISTRO=EDIT_HM_DISTRO
_HM_ONLY=EDIT_HM_ONLY
@@ -320,11 +319,6 @@ else
rm -f drush-$_DRUSH_VERSION.tar.gz
_DRUSH_CC_REQ=YES
fi
-if [ "$_DRUSH_FAMILY" = "3" ] ; then
- cd $_ROOT/tools/drush
- cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/patches/user.drush.inc.patch ./
- patch -p0 < user.drush.inc.patch &> /dev/null
-fi
if [ "$_DRUSH_VERSION" = "7.x-4.5" ] || [ "$_DRUSH_VERSION" = "4.6-dev" ] ; then
sed -i "s/which one she wants./which one she wants.\n chdir(\$request['base_project_path'])\;/g" $_ROOT/tools/drush/commands/pm/package_handler/wget.inc &> /dev/null
fi
@@ -670,13 +664,8 @@ if [ -e "$_AEGIR_ROOT/sites/$_DOMAIN/settings.php" ] ; then
mv -f make_home.php.txt make_home.php &> /dev/null
$_DRUSHCMD php-script make_home &> /dev/null
rm -f make_home.php
- if [ "$_DRUSH_FAMILY" = "3" ] ; then
- cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_client_3.php.txt ./
- mv -f make_client_3.php.txt make_client.php &> /dev/null
- else
- cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_client.php.txt ./
- mv -f make_client.php.txt make_client.php &> /dev/null
- fi
+ cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_client.php.txt ./
+ mv -f make_client.php.txt make_client.php &> /dev/null
if [ "$_THIS_DB_HOST" = "localhost" ] ; then
$_DRUSHCMD @hostmaster sqlq "UPDATE hosting_platform SET status=-1 WHERE nid=7" &> /dev/null
else
View
10 aegir/scripts/AegirSetupC.sh.txt
@@ -95,7 +95,6 @@ _CLIENT_OPTION=EDIT_CLIENT_OPTION
_DEBUG_MODE=EDIT_DEBUG_MODE
_DISTRO=EDIT_DISTRO
_DOMAIN=EDIT_DOMAIN
-_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION
_HM_DISTRO=EDIT_HM_DISTRO
_HM_ONLY=EDIT_HM_ONLY
@@ -2779,13 +2778,8 @@ else
#msg "_THIS_HOSTMASTER is $_THIS_HOSTMASTER (2)"
cd $_THIS_HOSTMASTER
fi
-if [ $_DRUSH_FAMILY = "3" ] ; then
- cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_platform_3.php.txt ./
- mv -f make_platform_3.php.txt make_platform.php &> /dev/null
-else
- cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_platform.php.txt ./
- mv -f make_platform.php.txt make_platform.php &> /dev/null
-fi
+cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_platform.php.txt ./
+mv -f make_platform.php.txt make_platform.php &> /dev/null
if [ -d "$_ROOT/distro/$_THIS_CORE/acquia-$_SMALLCORE6" ] ; then
if [ ! -e "$_ROOT/distro/$_THIS_CORE/acquia-$_SMALLCORE6/drushrc.php" ] ; then
$_DRUSHCMD php-script make_platform "$_F_ACQUIA" acquia $_ROOT/distro/$_THIS_CORE/acquia-$_SMALLCORE6 &> /dev/null
View
1  aegir/scripts/AegirSetupM.sh.txt
@@ -30,7 +30,6 @@ _AEGIR_VERSION=EDIT_AEGIR_VERSION
_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
_BOA_REPO_NAME=EDIT_BOA_REPO_NAME
_DRUSH_CC_REQ=NO
-_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION
_FROM_SOURCES=EDIT_FROM_SOURCES
_PHP_CLI_VERSION=EDIT_PHP_CLI_VERSION
View
1  aegir/scripts/AegirUpgrade.sh.txt
@@ -40,7 +40,6 @@ _BOA_REPO_NAME=EDIT_BOA_REPO_NAME
_DEBUG_MODE=EDIT_DEBUG_MODE
_DOMAIN=EDIT_DOMAIN
_DRUSH_CC_REQ=NO
-_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION
_FROM_SOURCES=EDIT_FROM_SOURCES
_HTTP_WILDCARD=EDIT_HTTP_WILDCARD
Please sign in to comment.
Something went wrong with that request. Please try again.