generalize

.travis.yml

@@ -7,8 +7,9 @@ cache:
 
 env:
   global:
-  - GATK_PATH=$HOME/virtualenv/bin_bundles/GenomeAnalysisTK-3.3-0-g37228af
-  - NOVOALIGN_PATH=$HOME/virtualenv/bin_bundles/novocraft_v3
+  - CACHE_DIR="$HOME/virtualenv"
+  - GATK_PATH="$CACHE_DIR/bin_bundles/GenomeAnalysisTK-3.3-0-g37228af"
+  - NOVOALIGN_PATH="$CACHE_DIR/bin_bundles/novocraft_v3"
   - PYTHONIOENCODING=UTF8
   - secure: l9tLtFKGNhaRdRN2N7Fiks63VatVCOtDUG7FI/pi7JNJu/EriTwDRlncoVCRCJZKOdxG8OrwC1BLX6CNqpVjJISEPGV/djsf2wCV9vi6oa+OsvMymsJAjOYkLezwRLVZp/0l/sGumPGz+q+XIM8VnkOZezIvZjGaaAtBpRTHdmA=
 

travis/before_install.sh

@@ -7,8 +7,8 @@ set -e
 if [ "$TRAVIS_BRANCH" != "master" ]; then
     echo "Travis docker caches allowed for branch $TRAVIS_BRANCH"
     rm -rf tools/build
-    mkdir -p $HOME/virtualenv/tools_build
-    ln -s $HOME/virtualenv/tools_build tools/build
+    mkdir -p $CACHE_DIR/tools_build
+    ln -s $CACHE_DIR/tools_build tools/build
 
 else
     echo "Travis docker cache disabled for tools/build on master branch"
@@ -17,4 +17,4 @@ fi
 
 # Report how big things are
 echo "Docker cache space usage:"
-du -hs $HOME/virtualenv/*
+du -hs $CACHE_DIR/*

travis/install-tools.sh

@@ -11,7 +11,7 @@ if [ ! -d $GATK_PATH -o ! -d $NOVOALIGN_PATH ]; then
     pwd
     wget http://www.broadinstitute.org/~dpark/viral_ngs-gatk_novoalign-encrypted_for_travis.tar.gz.enc
     openssl aes-256-cbc -d -k "$BUNDLE_SECRET" -in viral_ngs-gatk_novoalign-encrypted_for_travis.tar.gz.enc -out bin_bundles.tar.gz
-    tar -xzpvf bin_bundles.tar.gz -C "$HOME/virtualenv"
+    tar -xzpvf bin_bundles.tar.gz -C "$CACHE_DIR"
 
   fi
 fi