diff --git a/gitlab/functions.sh b/gitlab/functions.sh index 4ca54f67107923db5f122dff73db0a222bdf2501..f66afab0808b6d70c04417c783d0fe42bcd49258 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