From 5f02768cbda099668a783420c25ebcdd454cb3a6 Mon Sep 17 00:00:00 2001 From: Andre Anjos <andre.dos.anjos@gmail.com> Date: Tue, 6 Sep 2016 19:42:37 +0200 Subject: [PATCH] [bootstrap] Fix and clause --- bootstrap-conda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-conda.sh b/bootstrap-conda.sh index 3629310..8cb80a5 100755 --- a/bootstrap-conda.sh +++ b/bootstrap-conda.sh @@ -44,7 +44,7 @@ if [ ! -d ${PREFIX} ]; then curl --silent https://gitlab.idiap.ch/bob/bob.admin/raw/master/${ARCH}/devel-py${pyver}.txt > env.txt echo "[++] Bootstrapping conda installation at ${PREFIX}..." run_cmd ${CONDA_FOLDER}/bin/conda create --prefix ${PREFIX} --file env.txt --yes - if [ "${ARCH}" == "macosx" && -e "${PREFIX}/lib/libjpeg.8.dylib" ]; then + if [ "${ARCH}" == "macosx" ] && [ -e "${PREFIX}/lib/libjpeg.8.dylib" ]; then run_cmd install_name_tool -id @rpath/libjpeg.8.dylib ${PREFIX}/lib/libjpeg.8.dylib fi run_cmd ${CONDA_FOLDER}/bin/conda clean --lock -- GitLab