From d5e9f91c7baae9f17a68c093500d51e478cf7f50 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Sun, 1 Jan 2017 04:08:09 +0100
Subject: [PATCH] Travis CI: sudo: false (#561)

---
 .travis.yml | 11 ++++-------
 test/run    | 11 +++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15277c8..71b0d75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: ruby
-sudo: required
+sudo: false
 env:
   global:
     - DEPS=$HOME/deps
@@ -30,13 +30,10 @@ install: |
     ln -s /usr/bin/vim.nox ${DEPS}/bin/vim
     return
   elif [ "$ENV" == "neovim" ]; then
-    # https://github.com/neovim/neovim/wiki/Installing-Neovim
-    sudo apt-get install -y software-properties-common
-    sudo add-apt-repository -y ppa:neovim-ppa/unstable
-    sudo apt-get update -y
-    sudo apt-get install -y neovim
+    # https://github.com/neovim/bot-ci#nightly-builds
+    eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64"
     mkdir -p ${DEPS}/bin
-    ln -s /usr/bin/nvim ${DEPS}/bin/vim
+    ln -s $(which nvim) ${DEPS}/bin/vim
     return
   fi
 
diff --git a/test/run b/test/run
index d1706d9..ff50936 100755
--- a/test/run
+++ b/test/run
@@ -113,13 +113,12 @@ clone_repos
 prepare
 
 git --version
-VIM=$(select_vim)
-echo "Selected Vim: $VIM"
+vim=$(select_vim)
+echo "Selected Vim: $vim"
 if [ "${1:-}" = '!' ]; then
-  $VIM -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
+  $vim -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
   prepare &&
-  $VIM -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
+  $vim -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
 else
-  $VIM -Nu $TEMP/mini-vimrc -c 'Vader test.vader'
+  $vim -Nu $TEMP/mini-vimrc -c 'Vader test.vader'
 fi
-