diff --git a/scripts/install_vim.sh b/scripts/install_vim.sh index 5345307..dbbd22c 100644 --- a/scripts/install_vim.sh +++ b/scripts/install_vim.sh @@ -59,7 +59,7 @@ EOF INSTALL_PREFIX="/vim-build/$VIM_NAME" if [ "$FLAVOR" = vim ]; then - CONFIG_ARGS="--prefix=$INSTALL_PREFIX --enable-multibyte --without-x --enable-gui=no --with-compiledby=vim-testbed" + VIM_CONFIG_ARGS="--prefix=$INSTALL_PREFIX --enable-multibyte --without-x --enable-gui=no --with-compiledby=vim-testbed --with-tlib=ncurses" fi set +x echo "TAG:$TAG" @@ -74,7 +74,7 @@ EOF if [ -n "$PYTHON2" ]; then apk add --virtual vim-build python-dev if [ "$FLAVOR" = vim ]; then - CONFIG_ARGS="$CONFIG_ARGS --enable-pythoninterp=dynamic" + VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-pythoninterp=dynamic" else apk add --virtual vim-build py2-pip apk add python @@ -85,7 +85,7 @@ EOF if [ -n "$PYTHON3" ]; then apk add --virtual vim-build python3-dev if [ "$FLAVOR" = vim ]; then - CONFIG_ARGS="$CONFIG_ARGS --enable-python3interp=dynamic" + VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-python3interp=dynamic" else apk add python3 pip3 install neovim @@ -96,7 +96,7 @@ EOF apk add --virtual vim-build ruby-dev apk add ruby if [ "$FLAVOR" = vim ]; then - CONFIG_ARGS="$CONFIG_ARGS --enable-rubyinterp" + VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-rubyinterp" else apk add --virtual vim-build ruby-rdoc ruby-irb gem install neovim @@ -105,7 +105,7 @@ EOF if [ $LUA -eq 1 ]; then if [ "$FLAVOR" = vim ]; then - CONFIG_ARGS="$CONFIG_ARGS --enable-luainterp" + VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-luainterp" apk add --virtual vim-build lua-dev apk add lua else @@ -114,7 +114,7 @@ EOF fi if [ "$FLAVOR" = vim ] && [ -n "$CONFIGURE_OPTIONS" ]; then - CONFIG_ARGS="$CONFIG_ARGS $CONFIGURE_OPTIONS" + VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS $CONFIGURE_OPTIONS" fi cd /vim @@ -196,9 +196,9 @@ build() { fi fi - echo "Configuring with: $CONFIG_ARGS" + echo "Configuring with: $VIM_CONFIG_ARGS" # shellcheck disable=SC2086 - ./configure $CONFIG_ARGS || bail "Could not configure" + ./configure $VIM_CONFIG_ARGS || bail "Could not configure" make CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -j4 || bail "Make failed" make install || bail "Install failed"