From 4e06a57c05dbe1196bb4d50b7b6e454d89f40352 Mon Sep 17 00:00:00 2001 From: Martijn Vermaat <martijn@vermaat.name> Date: Tue, 11 Oct 2011 19:39:12 +0000 Subject: [PATCH] Make install/upgrade scripts a bit more robust git-svn-id: https://humgenprojects.lumc.nl/svn/mutalyzer/trunk@391 eb6bd6ab-9ccd-42b9-aceb-e2899b4a52f1 --- extras/post-install.sh | 16 +++++++++++----- extras/post-upgrade.sh | 1 + extras/pre-install.sh | 10 +++------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/extras/post-install.sh b/extras/post-install.sh index 9f7550db..0f5a249a 100644 --- a/extras/post-install.sh +++ b/extras/post-install.sh @@ -13,9 +13,11 @@ # # Todo: # - Copy doc to /usr/share/doc +# - Check if MySQL user/database exist before creating # - General cleanup set -e +set -u COLOR_INFO='\033[32m' COLOR_WARNING='\033[33m' @@ -155,9 +157,11 @@ EOF echo -e "${COLOR_INFO}Populating Mapping table with NCBI data (hg18)${COLOR_END}" # Populate Mapping table with NCBI data (hg18) -wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/ARCHIVE/BUILD.36.3/mapview/seq_gene.md.gz" -O - | zcat > /tmp/seq_gene.md +MAPPING=$(mktemp) +wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/ARCHIVE/BUILD.36.3/mapview/seq_gene.md.gz" -O - | zcat > $MAPPING echo -e "${COLOR_INFO}Importing NCBI mapping data, this may take a few minutes (hg18)${COLOR_END}" -$($BIN_MAPPING_UPDATE hg18 /tmp/seq_gene.md reference) +$($BIN_MAPPING_UPDATE hg18 $MAPPING reference) +rm $MAPPING echo -e "${COLOR_INFO}Creating tables in hg19 database${COLOR_END}" @@ -223,10 +227,12 @@ EOF echo -e "${COLOR_INFO}Populating Mapping table with NCBI data (hg19)${COLOR_END}" # Populate Mapping table with UCSC data (hg19) -#wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/mapview/seq_gene.md.gz" -O - | zcat > /tmp/seq_gene.md -wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/ARCHIVE/BUILD.37.2/mapview/seq_gene.md.gz" -O - | zcat > /tmp/seq_gene.md +MAPPING=$(mktemp) +#wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/mapview/seq_gene.md.gz" -O - | zcat > $MAPPING +wget "ftp://ftp.ncbi.nih.gov/genomes/H_sapiens/ARCHIVE/BUILD.37.2/mapview/seq_gene.md.gz" -O - | zcat > $MAPPING echo -e "${COLOR_INFO}Importing NCBI mapping data, this may take a few minutes (hg19)${COLOR_END}" -$($BIN_MAPPING_UPDATE hg19 /tmp/seq_gene.md 'GRCh37.p2-Primary Assembly') +$($BIN_MAPPING_UPDATE hg19 $MAPPING 'GRCh37.p2-Primary Assembly') +rm $MAPPING echo -e "${COLOR_INFO}Creating tables in mutalyzer database${COLOR_END}" diff --git a/extras/post-upgrade.sh b/extras/post-upgrade.sh index 37ae527a..b6224d76 100644 --- a/extras/post-upgrade.sh +++ b/extras/post-upgrade.sh @@ -12,6 +12,7 @@ # sudo bash extras/post-upgrade.sh set -e +set -u COLOR_INFO='\033[32m' COLOR_WARNING='\033[33m' diff --git a/extras/pre-install.sh b/extras/pre-install.sh index a49e65bc..64fa3034 100644 --- a/extras/pre-install.sh +++ b/extras/pre-install.sh @@ -12,6 +12,7 @@ # sudo bash extras/pre-install.sh set -e +set -u COLOR_INFO='\033[32m' COLOR_WARNING='\033[33m' @@ -44,15 +45,10 @@ apt-get install -y \ echo -e "${COLOR_INFO}Installing latest soaplib from git master${COLOR_END}" -mkdir -p /tmp/mutalyzer-install -pushd /tmp/mutalyzer-install - -git clone https://github.com/soaplib/soaplib.git -cd soaplib +pushd $(mktemp -d) +git clone https://github.com/soaplib/soaplib.git . python setup.py install - popd -rm -Rf /tmp/mutalyzer-install echo -e "${COLOR_INFO}Installing suds using easy_install${COLOR_END}" -- GitLab