From b6018ae42387d18a40a61d64467349f7ab6a4ffe Mon Sep 17 00:00:00 2001
From: Biometrics Bot <biometric@idiap.ch>
Date: Tue, 29 Nov 2016 23:10:27 +0100
Subject: [PATCH] Fix some aspects of #27
---
install/from-scratch.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index a00cb51..8974255 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -15,7 +15,11 @@ PYTHON_VERSION=$3
CONDA=${BASEDIR}/bin/conda
if [ -d ${BASEDIR}/envs/${NAME} ]; then
- ${CONDA} remove -n ${NAME} --all
+ ${CONDA} remove -n ${NAME} --all --yes
+ if [ -d ${BASEDIR}/envs/${NAME} ]; then
+ echo "[>>] Environment ${NAME} survived remove, brute force removing..."
+ rm -rf ${BASEDIR}/envs/${NAME}
+ fi
fi
# For a complete list of dependencies, please read:
@@ -23,7 +27,6 @@ fi
echo "[>>] Creating environment ${NAME} for python ${PYTHON_VERSION} with bob dependencies..."
${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults python=$PYTHON_VERSION \
boost \
- caffe \
cmake \
coverage \
cython \
@@ -59,6 +62,7 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
tensorflow \
virtualenv \
vlfeat
+ #caffe
echo "[>>] Bye!"
exit 0
--
GitLab