From 853cccec5709fcc0e088e04c55451f88a3e0001c Mon Sep 17 00:00:00 2001
From: Toni G <toni.giorgino@gmail.com>
Date: Thu, 6 Dec 2018 17:15:37 +0100
Subject: [PATCH] nn
---
conda/recipe/build.sh | 6 ++++--
conda/run-conda-build.sh | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/conda/recipe/build.sh b/conda/recipe/build.sh
index 4b0d7b788..ad1ffef99 100644
--- a/conda/recipe/build.sh
+++ b/conda/recipe/build.sh
@@ -2,8 +2,10 @@
env | sort
-# TG: The "disabled" features are workaround for possible conda+configure bugs in library
-# search: building is ok but linking with the .so doesn't find them (in conda-forge).
+# TG: The "disabled" features are workaround for possible
+# conda+configure bugs in library search: building is ok but
+# linking with the .so doesn't find them (in
+# conda-forge). Possibly the LD path needs tweaks.
# TODO: re-enable them and see. Also to do: install docs?
diff --git a/conda/run-conda-build.sh b/conda/run-conda-build.sh
index 71670f6cb..557b43228 100644
--- a/conda/run-conda-build.sh
+++ b/conda/run-conda-build.sh
@@ -39,7 +39,7 @@ ls -l $CONDA_HOME/conda-bld/$TRAVIS_OS_NAME-64
export VERSION=`date +%Y.%m.%d`
# Disabled because it fails
-if [[ -v CONDA_UPLOAD_TOKEN ]]; then
+if [[ -n "$CONDA_UPLOAD_TOKEN" ]]; then
USER=tonigi # fix this
anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l testing \
$CONDA_HOME/conda-bld/$TRAVIS_OS_NAME-64/plumed*.tar.bz2 --force
--
GitLab