Skip to content

Commit

Permalink
We no longer use _DRUSH_FAMILY for anything.
Browse files Browse the repository at this point in the history
  • Loading branch information
@omega8cc
omega8cc committed Mar 22, 2013
1 parent 75383d4 commit 49e6517
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 42 deletions.
15 changes: 0 additions & 15 deletions BARRACUDA.sh.txt
View file
Expand Up @@ -882,7 +882,6 @@ _INSTALLER_VERSION=BOA-2.0.6-dev
_APC_VERSION=3.1.13 _APC_VERSION=3.1.13
_BZR_VERSION=2.3.4 _BZR_VERSION=2.3.4
_CHIVE_VERSION=1.2 _CHIVE_VERSION=1.2
_DRUSH_FAMILY=4
_DRUSH_VERSION=4.6-dev _DRUSH_VERSION=4.6-dev
_GEOS_VERSION=3.3.7 _GEOS_VERSION=3.3.7
_GIT_VERSION=1.8.1.3 _GIT_VERSION=1.8.1.3
Expand All @@ -897,7 +896,6 @@ _PURE_FTPD_VERSION=1.0.36
_REDIS_VERSION=2.6.11 _REDIS_VERSION=2.6.11
if [ "$_USE_STOCK" = "YES" ] ; then if [ "$_USE_STOCK" = "YES" ] ; then
_DRUSH_VERSION=7.x-5.8 _DRUSH_VERSION=7.x-5.8
_DRUSH_FAMILY=5
fi fi


### ###
Expand Down Expand Up @@ -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_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_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_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_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_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 sed -i "s/EDIT_HTTP_WILDCARD/$_HTTP_WILDCARD/g" /var/aegir/AegirUpgrade.sh.txt &> /dev/null
Expand Down Expand Up @@ -3212,12 +3209,6 @@ upgrade_aegir_master () {
sed -i "s/3600/$_SPEED_VALID_MAX/g" /var/aegir/config/includes/global.inc &> /dev/null sed -i "s/3600/$_SPEED_VALID_MAX/g" /var/aegir/config/includes/global.inc &> /dev/null
update_redis_password update_redis_password
force_advanced_nginx_config 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 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 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 fi
Expand Down Expand Up @@ -5785,7 +5776,6 @@ if [ "$_STATUS" = "INIT" ] ; then
sed -i "s/EDIT_AEGIR_VERSION/$_AEGIR_VERSION/g" $Files &> /dev/null 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_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_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_DRUSH_VERSION/$_DRUSH_VERSION/g" $Files &> /dev/null
sed -i "s/EDIT_FROM_SOURCES/$_FROM_SOURCES/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 sed -i "s/EDIT_PHP_CLI_VERSION/$_PHP_CLI_VERSION/g" $Files &> /dev/null
Expand Down Expand Up @@ -5864,11 +5854,6 @@ if [ "$_STATUS" = "INIT" ] ; then
sed -i "s/3600/$_SPEED_VALID_MAX/g" /var/aegir/config/includes/global.inc &> /dev/null sed -i "s/3600/$_SPEED_VALID_MAX/g" /var/aegir/config/includes/global.inc &> /dev/null
update_redis_password update_redis_password
force_advanced_nginx_config 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 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 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 fi
Expand Down
3 changes: 0 additions & 3 deletions OCTOPUS.sh.txt
View file
Expand Up @@ -494,7 +494,6 @@ _INSTALLER_VERSION=BOA-2.0.6-dev
### ###
### Variables ### Variables
### ###
_DRUSH_FAMILY=4
_DRUSH_VERSION=4.6-dev _DRUSH_VERSION=4.6-dev
_NOW=`date +%y%m%d-%H%M` _NOW=`date +%y%m%d-%H%M`
_PLATFORMS_ONLY=NO _PLATFORMS_ONLY=NO
Expand All @@ -514,7 +513,6 @@ if [ -n "${STY+x}" ]; then
fi fi
if [ "$_USE_STOCK" = "YES" ] ; then if [ "$_USE_STOCK" = "YES" ] ; then
_DRUSH_VERSION=7.x-5.8 _DRUSH_VERSION=7.x-5.8
_DRUSH_FAMILY=5
fi fi


### ###
Expand Down Expand Up @@ -873,7 +871,6 @@ do
sed -i "s/EDIT_DRUPAL7/$_DRUPAL7/g" $Files &> /dev/null sed -i "s/EDIT_DRUPAL7/$_DRUPAL7/g" $Files &> /dev/null
sed -i "s/EDIT_DRUPAL8/$_DRUPAL8/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_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_DRUSH_VERSION/$_DRUSH_VERSION/g" $Files &> /dev/null
sed -i "s/EDIT_ELMS/$_ELMS/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 sed -i "s/EDIT_HM_DISTRO/$_HM_DISTRO/g" $Files &> /dev/null
Expand Down
1 change: 0 additions & 1 deletion aegir/scripts/AegirSetupA.sh.txt
View file
Expand Up @@ -98,7 +98,6 @@ _DEBUG_MODE=EDIT_DEBUG_MODE
_DIST_INSTALL=NO _DIST_INSTALL=NO
_DISTRO=EDIT_DISTRO _DISTRO=EDIT_DISTRO
_DOMAIN=EDIT_DOMAIN _DOMAIN=EDIT_DOMAIN
_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION _DRUSH_VERSION=EDIT_DRUSH_VERSION
_HM_DISTRO=EDIT_HM_DISTRO _HM_DISTRO=EDIT_HM_DISTRO
_HM_ONLY=EDIT_HM_ONLY _HM_ONLY=EDIT_HM_ONLY
Expand Down
15 changes: 2 additions & 13 deletions aegir/scripts/AegirSetupB.sh.txt
View file
Expand Up @@ -94,7 +94,6 @@ _DEBUG_MODE=EDIT_DEBUG_MODE
_DISTRO=EDIT_DISTRO _DISTRO=EDIT_DISTRO
_DOMAIN=EDIT_DOMAIN _DOMAIN=EDIT_DOMAIN
_DRUSH_CC_REQ=NO _DRUSH_CC_REQ=NO
_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION _DRUSH_VERSION=EDIT_DRUSH_VERSION
_HM_DISTRO=EDIT_HM_DISTRO _HM_DISTRO=EDIT_HM_DISTRO
_HM_ONLY=EDIT_HM_ONLY _HM_ONLY=EDIT_HM_ONLY
Expand Down Expand Up @@ -320,11 +319,6 @@ else
rm -f drush-$_DRUSH_VERSION.tar.gz rm -f drush-$_DRUSH_VERSION.tar.gz
_DRUSH_CC_REQ=YES _DRUSH_CC_REQ=YES
fi 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 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 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 fi
Expand Down Expand Up @@ -670,13 +664,8 @@ if [ -e "$_AEGIR_ROOT/sites/$_DOMAIN/settings.php" ] ; then
mv -f make_home.php.txt make_home.php &> /dev/null mv -f make_home.php.txt make_home.php &> /dev/null
$_DRUSHCMD php-script make_home &> /dev/null $_DRUSHCMD php-script make_home &> /dev/null
rm -f make_home.php rm -f make_home.php
if [ "$_DRUSH_FAMILY" = "3" ] ; then cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_client.php.txt ./
cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_client_3.php.txt ./ mv -f make_client.php.txt make_client.php &> /dev/null
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
if [ "$_THIS_DB_HOST" = "localhost" ] ; then if [ "$_THIS_DB_HOST" = "localhost" ] ; then
$_DRUSHCMD @hostmaster sqlq "UPDATE hosting_platform SET status=-1 WHERE nid=7" &> /dev/null $_DRUSHCMD @hostmaster sqlq "UPDATE hosting_platform SET status=-1 WHERE nid=7" &> /dev/null
else else
Expand Down
10 changes: 2 additions & 8 deletions aegir/scripts/AegirSetupC.sh.txt
View file
Expand Up @@ -95,7 +95,6 @@ _CLIENT_OPTION=EDIT_CLIENT_OPTION
_DEBUG_MODE=EDIT_DEBUG_MODE _DEBUG_MODE=EDIT_DEBUG_MODE
_DISTRO=EDIT_DISTRO _DISTRO=EDIT_DISTRO
_DOMAIN=EDIT_DOMAIN _DOMAIN=EDIT_DOMAIN
_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION _DRUSH_VERSION=EDIT_DRUSH_VERSION
_HM_DISTRO=EDIT_HM_DISTRO _HM_DISTRO=EDIT_HM_DISTRO
_HM_ONLY=EDIT_HM_ONLY _HM_ONLY=EDIT_HM_ONLY
Expand Down Expand Up @@ -2779,13 +2778,8 @@ else
#msg "_THIS_HOSTMASTER is $_THIS_HOSTMASTER (2)" #msg "_THIS_HOSTMASTER is $_THIS_HOSTMASTER (2)"
cd $_THIS_HOSTMASTER cd $_THIS_HOSTMASTER
fi fi
if [ $_DRUSH_FAMILY = "3" ] ; then cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_platform.php.txt ./
cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/helpers/make_platform_3.php.txt ./ mv -f make_platform.php.txt make_platform.php &> /dev/null
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
if [ -d "$_ROOT/distro/$_THIS_CORE/acquia-$_SMALLCORE6" ] ; then if [ -d "$_ROOT/distro/$_THIS_CORE/acquia-$_SMALLCORE6" ] ; then
if [ ! -e "$_ROOT/distro/$_THIS_CORE/acquia-$_SMALLCORE6/drushrc.php" ] ; 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 $_DRUSHCMD php-script make_platform "$_F_ACQUIA" acquia $_ROOT/distro/$_THIS_CORE/acquia-$_SMALLCORE6 &> /dev/null
Expand Down
1 change: 0 additions & 1 deletion aegir/scripts/AegirSetupM.sh.txt
View file
Expand Up @@ -30,7 +30,6 @@ _AEGIR_VERSION=EDIT_AEGIR_VERSION
_BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL _BOA_REPO_GIT_URL=EDIT_BOA_REPO_GIT_URL
_BOA_REPO_NAME=EDIT_BOA_REPO_NAME _BOA_REPO_NAME=EDIT_BOA_REPO_NAME
_DRUSH_CC_REQ=NO _DRUSH_CC_REQ=NO
_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION _DRUSH_VERSION=EDIT_DRUSH_VERSION
_FROM_SOURCES=EDIT_FROM_SOURCES _FROM_SOURCES=EDIT_FROM_SOURCES
_PHP_CLI_VERSION=EDIT_PHP_CLI_VERSION _PHP_CLI_VERSION=EDIT_PHP_CLI_VERSION
Expand Down
1 change: 0 additions & 1 deletion aegir/scripts/AegirUpgrade.sh.txt
View file
Expand Up @@ -40,7 +40,6 @@ _BOA_REPO_NAME=EDIT_BOA_REPO_NAME
_DEBUG_MODE=EDIT_DEBUG_MODE _DEBUG_MODE=EDIT_DEBUG_MODE
_DOMAIN=EDIT_DOMAIN _DOMAIN=EDIT_DOMAIN
_DRUSH_CC_REQ=NO _DRUSH_CC_REQ=NO
_DRUSH_FAMILY=EDIT_DRUSH_FAMILY
_DRUSH_VERSION=EDIT_DRUSH_VERSION _DRUSH_VERSION=EDIT_DRUSH_VERSION
_FROM_SOURCES=EDIT_FROM_SOURCES _FROM_SOURCES=EDIT_FROM_SOURCES
_HTTP_WILDCARD=EDIT_HTTP_WILDCARD _HTTP_WILDCARD=EDIT_HTTP_WILDCARD
Expand Down

0 comments on commit 49e6517

Please sign in to comment.