Commit 05a739d0 authored by Matthieu Muffato's avatar Matthieu Muffato
Browse files

Synchronized the two deployment scripts

parent 27551ca4
......@@ -31,6 +31,8 @@ then
echo "'$GUIHIVE_VERSIONS_DIR' and/or '$EHIVE_VERSIONS_DIR' already exist. Press ctrl+c to exit now, or enter otherwise/"
read
fi
mkdir -p "$GUIHIVE_VERSIONS_DIR"
mkdir -p "$EHIVE_VERSIONS_DIR"
# Any failure will cause the script to exit
trap "echo 'An error occurred. Deployment aborted'; exit 1" EXIT
......
#!/bin/bash
EHIVE_DEFAULT_URL='git://www.github.com/Ensembl/ensembl-hive'
EHIVE_URL=${EHIVE_URL:-$EHIVE_DEFAULT_URL}
GUIHIVE_URL='git://www.github.com/Ensembl/guiHive'
DEPLOY_LOCATION="$(dirname "$0")"
EHIVE_CLONE_LOCATION="${DEPLOY_LOCATION}/clones/ensembl-hive"
GUIHIVE_CLONE_LOCATION="${DEPLOY_LOCATION}/clones/guiHive"
GUIHIVE_VERSIONS_DIR="${DEPLOY_LOCATION}"/versions
EHIVE_VERSIONS_DIR="${DEPLOY_LOCATION}"/ensembl-hive
GUIHIVE_VERSIONS_DIR="${DEPLOY_LOCATION}"/versions
# if you specify a new EHIVE_SOURCE, the Hive cache will be automatically cleaned up:
if [ -n "$EHIVE_SOURCE" ]
then
rm -rf "$EHIVE_CLONE_LOCATION" "$EHIVE_VERSIONS_DIR"
fi
# if you specify a new EHIVE_SOURCE, the guiHive cache will be automatically cleaned up:
if [ -n "$GUIHIVE_SOURCE" ]
then
rm -rf "$GUIHIVE_CLONE_LOCATION" "$GUIHIVE_VERSIONS_DIR"
fi
EHIVE_DEFAULT_SOURCE='git://www.github.com/Ensembl/ensembl-hive'
EHIVE_SOURCE=${EHIVE_SOURCE:-$EHIVE_DEFAULT_SOURCE}
GUIHIVE_DEFAULT_SOURCE='git://www.github.com/Ensembl/guiHive'
GUIHIVE_SOURCE=${GUIHIVE_SOURCE:-$GUIHIVE_DEFAULT_SOURCE}
umask 0002
......@@ -36,8 +49,8 @@ reference_clone () {
fi
}
reference_clone "$EHIVE_URL" "$EHIVE_CLONE_LOCATION"
reference_clone "$GUIHIVE_URL" "$GUIHIVE_CLONE_LOCATION"
reference_clone "$EHIVE_SOURCE" "$EHIVE_CLONE_LOCATION"
reference_clone "$GUIHIVE_SOURCE" "$GUIHIVE_CLONE_LOCATION"
## "Safe" functions that can deal with pre-incarnations of the target
......@@ -84,7 +97,9 @@ add_guihive_version "62" "db_version/62" "version/2.2"
add_guihive_version "73" "db_version/73" "version/2.3"
add_guihive_version "80" "db_version/80" "version/2.4"
add_guihive_version "84" "db_version/84" "sql_schema_85_start~3"
add_guihive_version "88" "db_version/88" "master"
add_guihive_version "88" "db_version/88" "sql_schema_89_start^"
add_guihive_version "89" "db_version/89" "sql_schema_90_start^"
add_guihive_version "91" "db_version/91" "sql_schema_92_start^"
# 2. Then we list all the other eHive database versions and link them to a compatible guiHive version
......@@ -111,11 +126,15 @@ link_guihive_version "79" "80"
link_guihive_version "81" "80"
link_guihive_version "82" "80"
link_guihive_version "83" "80"
link_guihive_version "83" "80"
# 84 is listed in the first section
link_guihive_version "85" "88"
link_guihive_version "86" "88"
link_guihive_version "87" "88"
# 88 is listed in the first section
# 89 is listed in the first section
link_guihive_version "90" "89"
# 91 is listed in the first section
link_guihive_version "92" "91" "master"
trap - EXIT
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