From 816369f0ef8d576a946bfb4ca2670801131f97f6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 10 Sep 2017 13:21:03 +0200
Subject: [PATCH] travis: Clean up Travis scripts

---
 scripts/dev/ci/travis_install.sh | 24 +-----------------------
 scripts/dev/ci/travis_run.sh     |  4 ++--
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index cf86991ed..f5884d4ac 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # vim: ft=sh fileencoding=utf-8 sts=4 sw=4 et:
 
 # Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
@@ -42,17 +43,6 @@ travis_retry() {
     return $result
 }
 
-apt_install() {
-    sudo tee /etc/apt/sources.list <<EOF
-deb http://us.archive.ubuntu.com/ubuntu/ trusty main
-deb http://us.archive.ubuntu.com/ubuntu/ trusty-security main
-deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates main
-EOF
-    sudo rm -rf /etc/apt/sources.list.d
-    travis_retry sudo apt-get -y -q update
-    travis_retry sudo apt-get -y -q install --no-install-recommends "$@"
-}
-
 brew_install() {
     brew update
     brew install "$@"
@@ -63,18 +53,6 @@ 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 "$@"
-}
-
-install_node() {
-    curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
-    travis_retry sudo apt-get -y -q update
-    travis_retry sudo apt-get -y -q install --no-install-recommends nodejs
-}
-
 check_pyqt() {
     python3 <<EOF
 import sys
diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh
index 2457b81c1..7422561e2 100644
--- a/scripts/dev/ci/travis_run.sh
+++ b/scripts/dev/ci/travis_run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [[ $DOCKER ]]; then
-    docker run --privileged -v $PWD:/outside -e QUTE_BDD_WEBENGINE=$QUTE_BDD_WEBENGINE -e DOCKER=$DOCKER qutebrowser/travis:$DOCKER
+    docker run --privileged -v "$PWD:/outside" -e "QUTE_BDD_WEBENGINE=$QUTE_BDD_WEBENGINE" -e "DOCKER=$DOCKER" "qutebrowser/travis:$DOCKER"
 elif [[ $TESTENV == eslint ]]; then
     # Can't run this via tox as we can't easily install tox in the javascript travis env
     cd qutebrowser/javascript || exit 1
@@ -10,5 +10,5 @@ else
     args=()
     [[ $TRAVIS_OS_NAME == osx ]] && args=('--qute-bdd-webengine' '--no-xvfb')
 
-    tox -e $TESTENV -- "${args[@]}"
+    tox -e "$TESTENV" -- "${args[@]}"
 fi