tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move from /opt to $HOME/opt

This commit is contained in:
Foo 2015-05-10 19:40:47 +03:00
parent d9790cc1ae
commit b88a16c98f
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/install.sh
View File

@ -7,15 +7,17 @@ git clone --depth=1 git://github.com/powerline/deps tests/bot-ci/deps
sudo apt-get install -qq libssl1.0.0 sudo apt-get install -qq libssl1.0.0
sudo apt-get install -qq zsh tcsh mksh busybox socat realpath bc rc tmux sudo apt-get install -qq zsh tcsh mksh busybox socat realpath bc rc tmux
mkdir -p "$HOME/opt"
if test -n "$USE_UCS2_PYTHON" ; then if test -n "$USE_UCS2_PYTHON" ; then
pip install virtualenvwrapper pip install virtualenvwrapper
set +e set +e
. virtualenvwrapper.sh . virtualenvwrapper.sh
set -e set -e
archive="${PWD:-$(pwd)}/tests/bot-ci/deps/cpython-ucs2/cpython-ucs2-${UCS2_PYTHON_VARIANT}.tar.gz" archive="${PWD:-$(pwd)}/tests/bot-ci/deps/cpython-ucs2/cpython-ucs2-${UCS2_PYTHON_VARIANT}.tar.gz"
sudo sh -c "cd /opt && tar xzf $archive" sh -c "cd $HOME/opt && tar xzf $archive"
PYTHON="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/bin/python$UCS2_PYTHON_VARIANT" PYTHON="$HOME/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/bin/python$UCS2_PYTHON_VARIANT"
export LD_LIBRARY_PATH="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="$HOME/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
set +e set +e
mkvirtualenv -p "$PYTHON" cpython-ucs2-$UCS2_PYTHON_VARIANT mkvirtualenv -p "$PYTHON" cpython-ucs2-$UCS2_PYTHON_VARIANT
set -e set -e
@ -37,11 +39,11 @@ else
fi fi
if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
archive="${PWD:-$(pwd)}/tests/bot-ci/deps/zpython/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}.tar.gz" archive="${PWD:-$(pwd)}/tests/bot-ci/deps/zpython/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}.tar.gz"
sudo sh -c "cd /opt && tar xzf $archive" sh -c "cd $HOME/opt && tar xzf $archive"
fi fi
archive="${PWD:-$(pwd)}/tests/bot-ci/deps/fish/fish.tar.gz" archive="${PWD:-$(pwd)}/tests/bot-ci/deps/fish/fish.tar.gz"
sudo sh -c "cd /opt && tar xzf $archive" sh -c "cd $HOME/opt && tar xzf $archive"
mkdir tests/vim-plugins mkdir tests/vim-plugins

2
tests/run_vim_tests.sh
View File

@ -6,7 +6,7 @@ if test -z "$VIM" ; then
if test -n "$USE_UCS2_PYTHON" ; then if test -n "$USE_UCS2_PYTHON" ; then
NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$UCS2_PYTHON_VARIANT-ucs2-double/vim" NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$UCS2_PYTHON_VARIANT-ucs2-double/vim"
OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$UCS2_PYTHON_VARIANT-ucs2/vim" OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$UCS2_PYTHON_VARIANT-ucs2/vim"
opt_dir="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT" opt_dir="$HOME/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT"
main_path="$opt_dir/lib/python$UCS2_PYTHON_VARIANT" main_path="$opt_dir/lib/python$UCS2_PYTHON_VARIANT"
site_path="$main_path/site-packages" site_path="$main_path/site-packages"
venv_main_path="$VIRTUAL_ENV/lib/python$UCS2_PYTHON_VARIANT" venv_main_path="$VIRTUAL_ENV/lib/python$UCS2_PYTHON_VARIANT"

6
tests/test.sh
View File

@ -9,14 +9,14 @@ export USER HOME
FAILED=0 FAILED=0
if test "$TRAVIS" = true ; then if test "$TRAVIS" = true ; then
export PATH="/opt/fish/bin:${PATH}" export PATH="$HOME/opt/fish/bin:${PATH}"
if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
export PATH="/opt/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}/bin:${PATH}" export PATH="$HOME/opt/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}/bin:${PATH}"
fi fi
if test -n "$USE_UCS2_PYTHON" ; then if test -n "$USE_UCS2_PYTHON" ; then
export LD_LIBRARY_PATH="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$HOME/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
set +e set +e
. virtualenvwrapper.sh . virtualenvwrapper.sh
workon cpython-ucs2-$UCS2_PYTHON_VARIANT workon cpython-ucs2-$UCS2_PYTHON_VARIANT