Commit 261ca1e3 authored by mig5's avatar mig5 Committed by mig5

re-instate hardcoded aegir version in the two shell scripts, which can't...

re-instate hardcoded aegir version in the two shell scripts, which can't depend on provision already being present.
parent 653323b1
......@@ -28,7 +28,7 @@
########################################################################
# guess the aegir version based on the info file
AEGIR_VERSION=`sed -n '/^version/{s/^.*=//;p}' provision.info`
AEGIR_VERSION=HEAD
DRUSH_VERSION=6.x-3.3
########################################################################
......
......@@ -98,6 +98,12 @@ if ! [ -z "$old_version" ]; then
fi
git add docs/UPGRADE.txt && rm docs/UPGRADE.txt.tmp
echo changing install.sh.txt version
sed -i'.tmp' -e"s/AEGIR_VERSION=.*$/AEGIR_VERSION=\"$version\"/" install.sh.txt && git add install.sh.txt && rm install.sh.txt.tmp
echo changing upgrade.sh.txt version
sed -i'.tmp' -e"s/AEGIR_VERSION=.*$/AEGIR_VERSION=\"$version\"/" upgrade.sh.txt && git add upgrade.sh.txt && rm upgrade.sh.txt.tmp
echo resulting changes to be committed:
git diff --cached | cat
......
......@@ -11,14 +11,14 @@
########################################################################
# basic variables, change before running
AEGIR_VERSION=`sed -n '/^version/{s/^.*=//;p}' provision.info`
AEGIR_VERSION=HEAD
AEGIR_DOMAIN=aegir.example.com
AEGIR_DIR=/var/aegir
DRUPAL_DIR=$AEGIR_DIR/hostmaster-$AEGIR_VERSION
DRUSH_VERSION=6.x-3.3
DRUSH_MAKE_VERSION=6.x-2.0-beta9
OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-alpha14
OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-beta1
DRUSH_DIR=$AEGIR_DIR/drush
DRUSH="php $DRUSH_DIR/drush.php"
BACKUP_DIR=$AEGIR_DIR/pre-upgrade-`date '+%F-%H%M'`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment