From 9370a0e5d859f692f6fa24c27c76410b54595be4 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sun, 7 Jan 2018 18:37:31 -0500
Subject: [PATCH] ci/travis: install neovim npm module on osx (#7825)

Always get latest nvm on osx to fix lts aliases.
---
 ci/before_install.sh | 16 +++++++---------
 ci/install.sh        |  6 ++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ci/before_install.sh b/ci/before_install.sh
index f5a57ad657..9f512ee5b9 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -38,14 +38,12 @@ else
   pip3 -q install --user --upgrade pip || true
 fi
 
-if [[ "${TRAVIS_OS_NAME}" == linux ]]; then
-  echo "Install node (LTS)"
+echo "Install node (LTS)"
 
-  if [ ! -f ~/.nvm/nvm.sh ]; then
-    curl -o ~/.nvm/nvm.sh https://raw.githubusercontent.com/creationix/nvm/master/nvm.sh
-  fi
-
-  source ~/.nvm/nvm.sh
-  nvm install --lts
-  nvm use --lts
+if [[ "${TRAVIS_OS_NAME}" == osx ]] || [ ! -f ~/.nvm/nvm.sh ]; then
+  curl -o ~/.nvm/nvm.sh https://raw.githubusercontent.com/creationix/nvm/master/nvm.sh
 fi
+
+source ~/.nvm/nvm.sh
+nvm install --lts
+nvm use --lts
diff --git a/ci/install.sh b/ci/install.sh
index f51ba1a776..eb7fb14760 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -26,7 +26,5 @@ if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then
   gem install --no-document --version ">= 0.2.0" neovim
 fi
 
-if [[ "${TRAVIS_OS_NAME}" == linux ]]; then
-  echo "Install neovim npm package"
-  npm install -g neovim
-fi
+echo "Install neovim npm package"
+npm install -g neovim