From fc59cc95c5b632cf8c808f787630329786c0ab0d Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 24 Jan 2019 21:16:56 +1100
Subject: [PATCH] travis fixups

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 103a7fb3f..95303442d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ dist: trusty
 
 matrix:
   include:
-  - env: ARCH=x86_64 APPIMG=appimagetool-x86_64.AppImage
-  - env: ARCH=i386 APPIMG=appimagetool-i686.AppImage
+  - env: ARCH=x86_64 APPIMGTOOL=appimagetool-x86_64.AppImage
+  - env: ARCH=i386 APPIMGTOOL=appimagetool-i686.AppImage
 
 before_install:
   - sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
@@ -14,8 +14,8 @@ before_install:
   - sudo apt-get update -qq
 
 install:
-  - if [ "$ARCH" == "x86_64" ]; then sudo apt-get -y install qt59base qt59multimedia libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins; fi
-  - if [ "$ARCH" == "i386" ]; then sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386 pkg-config:i386  libgl1-mesa-dev:i386; fi
+  - if [ "$ARCH" == "x86_64" ]; then sudo apt-get -y install qt59base qt59multimedia libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse; fi
+  - if [ "$ARCH" == "i386" ]; then sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386; fi
   - source /opt/qt*/bin/qt*-env.sh
 
 script:
@@ -26,11 +26,12 @@ script:
   - mkdir -p appdir/usr/bin/ ; cp olive-editor appdir/usr/bin/ # FIXME; "make install" should do this
   - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
   - chmod a+x linuxdeployqt-continuous-x86_64.AppImage
-  - wget -c -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/$APPIMG"; chmod a+x appimagetool-i686.AppImage
+  - wget -c -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/$APPIMGTOOL"
+  - chmod a+x $APPIMGTOOL
   - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
   - export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file
   - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop
-  - ./$APPIMG 'appdir' -n -g
+  - ./$APPIMGTOOL 'appdir' -n -g
 
 after_success:
   - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq