From 8f0a578ade1538d8d3d9b95519ec767be7b27ba2 Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Fri, 8 Mar 2019 17:13:48 -0800
Subject: [PATCH] travis update attempt 2

Use `xvfb` as per instructions at:

https://docs.travis-ci.com/user/gui-and-headless-browsers/

to run the `--help` check on linux.

Try https url for `pkg.mxe.cc`.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
---
 .travis.yml | 5 ++++-
 installdeps | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7df77f27..635a8ad5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 ---
 sudo: required
 
+services:
+    - xvfb
+
 matrix:
     fast_finish: true
     include:
@@ -15,7 +18,7 @@ matrix:
               - cd build
               - cmake ..
               - make -j2
-              - ./visualboyadvance-m --help
+              - xvfb-run ./visualboyadvance-m --help
           cache:
               directories:
                   - "$HOME/.ccache"
diff --git a/installdeps b/installdeps
index 7d659d40..f856d833 100755
--- a/installdeps
+++ b/installdeps
@@ -306,7 +306,7 @@ debian_installdeps() {
 
         apt_ssl_exceptions=/etc/apt/apt.conf.d/80ssl-exceptions
 
-        if ! grep -q 'pkg\.mxe\.cc' $apt_ssl_exceptions; then
+        if ! grep -q 'pkg\.mxe\.cc' $apt_ssl_exceptions 2>/dev/null; then
             sudo sh -c "cat >> $apt_ssl_exceptions" <<EOF
 Acquire::https::${debian_rel}.mxe.cc::Verify-Peer "false";
 Acquire::https::${debian_rel}.mxe.cc::Verify-Host "false";
@@ -318,7 +318,7 @@ EOF
         sudo apt-get -qq update
         if [ -z "$(apt-cache search '^mxe-source$')" ]; then
             if [ ! -f "$mxe_apt_sources" ]; then
-                echo "deb http://pkg.mxe.cc/repos/apt/dists $debian_rel main" | sudo -- sh -c "cat > $mxe_apt_sources"
+                echo "deb https://pkg.mxe.cc/repos/apt/dists $debian_rel main" | sudo -- sh -c "cat > $mxe_apt_sources"
                 check sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
             else
                 error "$mxe_apt_sources exists but mxe packages are not found in apt, either delete it or fix it"