From cd5c1fd09dcefa2f5aeee64ff2a7e7579cd6a693 Mon Sep 17 00:00:00 2001 From: Holger Rapp Date: Sun, 1 Apr 2018 20:51:05 +0200 Subject: [PATCH] Install vim in /usr/local instead of /root inside docker. --- scripts/build_vim.sh | 1 - scripts/run_tests.sh | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/build_vim.sh b/scripts/build_vim.sh index 2087da1..008e4e0 100755 --- a/scripts/build_vim.sh +++ b/scripts/build_vim.sh @@ -14,7 +14,6 @@ fi export CFLAGS="$(python-config --cflags)" echo $CFLAGS ./configure \ - --prefix=${HOME} \ --disable-nls \ --disable-sysmouse \ --disable-gpm \ diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 371befd..7f0e95b 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -3,11 +3,10 @@ set -e PYTHON_CMD="$(which python)" -INTERFACE="--interface tmux" -VIM="$HOME/bin/vim" +VIM="/usr/local/bin/vim" PYTHON_VERSION=$($PYTHON_CMD -c 'import sys;print(sys.version.split()[0])') echo "Using python from: $PYTHON_CMD Version: $PYTHON_VERSION" -echo "Using vim from:" +echo "Using vim from: $VIM" $VIM --version | head -n 3 set -x @@ -19,5 +18,5 @@ $PYTHON_CMD ./test_all.py \ --plugins \ --session vim \ --vim $VIM \ - $INTERFACE \ + --interface tmux \ --expected-python-version $PYTHON_VERSION