Commit 9edecf5d authored by mig5's avatar mig5 Committed by mig5

fix install so --version is actually considered, before defaulting to HEAD....

fix install so --version is actually considered, before defaulting to HEAD. add --version to the hostmaster-install command in INSTALL.txt, and add this variable to be changed in the release script
parent 17cf161d
......@@ -315,7 +315,7 @@ the hostmaster-install command.
Shell commands::
drush hostmaster-install
drush hostmaster-install --version=HEAD
You will be prompted for the required information if not provided on the
commandline. See the inline help for the available options::
......
......@@ -7,7 +7,7 @@
function drush_provision_hostmaster_install_validate($site = NULL) {
// set defaults for this whole script
// those are settings that are not prompted to the user but still overridable
$version = drush_set_default('version', 'HEAD');
$version = drush_set_default('version', drush_get_option('version', 'HEAD'));
$aegir_root = drush_set_default('aegir_root', drush_server_home());
drush_set_default('root', $aegir_root . '/' . 'hostmaster-' . $version);
drush_set_default('r', drush_get_option('root'));
......
......@@ -83,6 +83,10 @@ sed -i'.tmp' -e'/^projects\[hostmaster\]\[download\]\[type\]/s/=.*$/ = "get"/' \
echo changing INSTALL.txt to point to tagged install.sh
sed -i'.tmp' -e"/http:\/\/git.aegirproject.org\/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=HEAD/s/HEAD/provision-$version/" docs/INSTALL.txt && git add docs/INSTALL.txt && rm docs/INSTALL.txt.tmp
echo changing INSTALL.txt to point hostmaster-install --version to tag
sed -i'.tmp' -e"s/--version=HEAD/--version=$version/" docs/INSTALL.txt
git add docs/INSTALL.txt && rm docs/INSTALL.txt.tmp
echo changing UPGRADE.txt to point to tagged upgrade.sh
sed -i'.tmp' -e"/http:\/\/git.aegirproject.org\/?p=provision.git;a=blob_plain;f=upgrade.sh.txt;hb=HEAD/s/HEAD/provision-$version/" docs/UPGRADE.txt && git add docs/UPGRADE.txt && rm docs/UPGRADE.txt.tmp
......
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