Merge branch 'master' into sy-bash-pipes

broadinstitute · Sep 16, 2016 · 485e313 · 485e313
2 parents b94d9f0 + 1ffc742
commit 485e313
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/easy-deploy-script/easy-deploy-viral-ngs.sh b/easy-deploy-script/easy-deploy-viral-ngs.sh
@@ -148,7 +148,7 @@ function install_miniconda(){
     if [ -d "$MINICONDA_PATH/bin" ]; then
         prepend_miniconda
         conda install -q -y conda==4.0.10
-        conda install -q -y conda-build>=1.7.1
+        conda install -q -y conda-build==1.7.1
     else
         echo "It looks like the Miniconda installation failed"
         exit 1
@@ -320,9 +320,6 @@ else
                         echo "$VIRAL_CONDA_ENV_PATH/ already exists. Skipping conda env setup."
                     fi
 
-                    echo "exiting.....$1"
-                    exit 0
-
                     activate_env
 
                     symlink_viral_ngs