summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Jacq2011-01-10 11:07:34 (GMT)
committermig52011-01-10 11:07:34 (GMT)
commit01ef568f51b2ca5c4d0298566c6fc1486ad74253 (patch)
treeb0ce92031f4686ce3f1d397e8a11e63d15e4699d
parenta229226aaed232d52fc379d6c6e06e1d0371ed76 (diff)
don't hardcode /var/aegir in upgrade.sh, rely on /home/miguel like install.sh.txt
-rw-r--r--upgrade.sh.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 77c103d..bccfb24 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -14,14 +14,14 @@
AEGIR_VERSION=HEAD
AEGIR_DOMAIN=aegir.example.com
-AEGIR_DIR=/var/aegir
-DRUPAL_DIR=$AEGIR_DIR/hostmaster-$AEGIR_VERSION
+AEGIR_HOME="$HOME"
+DRUPAL_DIR=$AEGIR_HOME/hostmaster-$AEGIR_VERSION
DRUSH_VERSION=7.x-4.0
DRUSH_MAKE_VERSION=6.x-2.0-beta10
-OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-beta1
-DRUSH_DIR=$AEGIR_DIR/drush
+OLD_DRUPAL_DIR=$AEGIR_HOME/hostmaster-0.4-beta2
+DRUSH_DIR=$AEGIR_HOME/drush
DRUSH="php $DRUSH_DIR/drush.php"
-BACKUP_DIR=$AEGIR_DIR/pre-upgrade-`date '+%F-%H%M'`
+BACKUP_DIR=$AEGIR_HOME/pre-upgrade-`date '+%F-%H%M'`
########################################################################
# functions
@@ -73,7 +73,7 @@ cat <<EOF
* that the following settings are correct
The Aegir version to upgrade to is $AEGIR_VERSION
-The Aegir home dir is $AEGIR_DIR
+The Aegir home dir is $AEGIR_HOME
The new hostmaster platform will be $DRUPAL_DIR
The version of Drush is $DRUSH_VERSION
The version of Drush Make is $DRUSH_MAKE_VERSION
@@ -98,7 +98,7 @@ if [ -d $DRUSH_DIR ]; then
mv $DRUSH_DIR $BACKUP_DIR
fi
-cd $AEGIR_DIR
+cd $AEGIR_HOME
wget http://ftp.drupal.org/files/projects/drush-$DRUSH_VERSION.tar.gz
gunzip -c drush-$DRUSH_VERSION.tar.gz | tar -xf -
rm drush-$DRUSH_VERSION.tar.gz