Skip to content

Improvements to install_vim.sh #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2019
Merged

Improvements to install_vim.sh #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42db960
install_vim.sh: shellcheck / bail if VIM_BIN was not created
blueyed May 13, 2017
91eca65
install_vim.sh: use VIM_CONFIG_ARGS, select ncurses
blueyed May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions scripts/install_vim.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,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 --with-tlib=ncurses"
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"
Expand All @@ -87,7 +87,7 @@ EOF
if [ -n "$PYTHON2" ]; then
apk_add_build_dep 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_build_dep py2-pip
apk add python
Expand All @@ -98,7 +98,7 @@ EOF
if [ -n "$PYTHON3" ]; then
apk_add_build_dep 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 pynvim
Expand All @@ -109,7 +109,7 @@ EOF
apk_add_build_dep 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_build_dep ruby-rdoc ruby-irb
gem install neovim
Expand All @@ -118,7 +118,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_build_dep lua5.3-dev
apk add lua5.3-libs
# Install symlinks to make Vim's configure pick it up.
Expand All @@ -130,7 +130,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
Expand Down Expand Up @@ -207,9 +207,9 @@ build() {
sed -i 's~sys/time.h termio.h~sys/time.h sys/types.h termio.h~' src/configure.in src/auto/configure
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"

Expand Down Expand Up @@ -255,6 +255,9 @@ build() {
else
VIM_BIN="$INSTALL_PREFIX/bin/nvim"
fi
if ! [ -e "$VIM_BIN" ]; then
bail "Binary $VIM_BIN was not created."
fi
link_target="/vim-build/bin/$NAME"
if [ -e "$link_target" ]; then
echo "WARNING: link target for $NAME exists already. Overwriting."
Expand Down