Preserve old value of LD_LIBRARY_PATH

This commit is contained in:
ZyX 2015-01-03 00:07:07 +03:00
parent e86ec8bf99
commit 6b89c8e394
2 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@ if test -n "$USE_UCS2_PYTHON" ; then
archive="${PWD:-$(pwd)}/tests/bot-ci/deps/cpython-ucs2/cpython-ucs2-${UCS2_PYTHON_VARIANT}.tar.gz"
sudo sh -c "cd /opt && tar xzf $archive"
PYTHON="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/bin/python$UCS2_PYTHON_VARIANT"
export LD_LIBRARY_PATH=/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/lib
export LD_LIBRARY_PATH="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
set +e
mkvirtualenv -p "$PYTHON" cpython-ucs2-$UCS2_PYTHON_VARIANT
set -e

View File

@ -10,7 +10,7 @@ if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
fi
if test -n "$USE_UCS2_PYTHON" ; then
export LD_LIBRARY_PATH=/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/lib
export LD_LIBRARY_PATH="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
set +e
. virtualenvwrapper.sh
workon cpython-ucs2-$UCS2_PYTHON_VARIANT