From 83c24de83f3603b998bb94007329f1231092b9a6 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 10 Feb 2019 13:04:03 -0800 Subject: [PATCH] one more line ending change --- .travis/install.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 8dd271ec9..5a63a5f10 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -1,10 +1,10 @@ -#!/bin/bash - -if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - brew install ffmpeg qt5 -elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then - 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 -fi - +#!/bin/bash + +if [[ $TRAVIS_OS_NAME == 'osx' ]]; then + brew install ffmpeg qt5 +elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then + 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 +fi +