From 37464c8e3a6fe939b00716ac6d2b3b9b04002251 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 10 Sep 2017 14:25:13 +0200
Subject: [PATCH] travis: Re-add installing eslint to travis_install

---
 scripts/dev/ci/travis_install.sh | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index f5884d4ac..0ecf1028a 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -53,6 +53,12 @@ pip_install() {
     travis_retry python -m pip install "$@"
 }
 
+npm_install() {
+    # Make sure npm is up-to-date first
+    travis_retry npm install -g npm
+    travis_retry npm install -g "$@"
+}
+
 check_pyqt() {
     python3 <<EOF
 import sys
@@ -87,7 +93,12 @@ elif [[ $TRAVIS_OS_NAME == osx ]]; then
     exit 0
 fi
 
-if [[ $TESTENV != eslint ]]; then
-    pip_install pip
-    pip_install -r misc/requirements/requirements-tox.txt
-fi
+case $TESTENV in
+    eslint)
+        npm_install eslint
+        ;;
+    *)
+        pip_install pip
+        pip_install -r misc/requirements/requirements-tox.txt
+        ;;
+esac