From 82c19a62cc7f3f004a12e4abed374e36124c4134 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 3 Jan 2017 10:42:28 +0100
Subject: [PATCH] Use unified conda dir
---
gitlab/functions.sh | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index ffa4357..8b24fca 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -199,11 +199,7 @@ check_pass DOCPASS
ARCH=`arch`
if [ -z "${CONDA_FOLDER}" ]; then
- if [ "${ARCH}" == "linux" ]; then
- CONDA_FOLDER=/local/conda
- else
- CONDA_FOLDER=/opt/conda
- fi
+ CONDA_FOLDER=/opt/conda
fi
if [ -z "${CONDA_PREFIX}" ]; then
--
GitLab