From 96353bac05ef1c2286fe25cf1e4eb522b79e8ce1 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 23 Sep 2016 18:29:39 +0200
Subject: [PATCH] Implement run_cmd_ld
---
gitlab/functions.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 4ca54f6..f66afab 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -59,6 +59,18 @@ run_cmd() {
}
+# Function for running command and echoing results, with LD_LIBRARY_PATH set
+run_cmd_ld() {
+ log_info "$ ${@}"
+ LD_LIBRARY_PATH=${BOB_PREFIX_PATH}/lib ${@}
+ local status=$?
+ if [ ${status} != 0 ]; then
+ log_error "Command Failed \"${@}\""
+ exit ${status}
+ fi
+}
+
+
# Runs setup.py
setup() {
run_cmd ${PREFIX}/bin/python setup.py ${@}
@@ -157,7 +169,6 @@ fi
PYVER=py$(echo ${PYTHON_VERSION} | tr -d '.')
BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/"
BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/bob-devel-${PYVER}
-export LD_LIBRARY_PATH=${BOB_PREFIX_PATH}/lib
if [ -z "${PYPISERVER}" ]; then
PYPISERVER="https://pypi.python.org/pypi"
@@ -175,6 +186,5 @@ check_env PYPISERVER
check_env TESTSERVER
check_env CONDA_FOLDER
check_env CONDA_PREFIX
-check_env LD_LIBRARY_PATH
check_env BOB_PREFIX_PATH
check_env BOB_DOCUMENTATION_SERVER
--
GitLab