From 7db1fe71655ea35b88d61203d0ff3f66e2896c35 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 10 Feb 2019 13:00:56 -0800
Subject: [PATCH] changed line endings in shell scripts

---
 .travis/after_success.sh  | 28 +++++++++---------
 .travis/before_install.sh | 16 +++++------
 .travis/script.sh         | 60 +++++++++++++++++++--------------------
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/.travis/after_success.sh b/.travis/after_success.sh
index c6fbeb4a6..99064916d 100644
--- a/.travis/after_success.sh
+++ b/.travis/after_success.sh
@@ -1,15 +1,15 @@
-#!/bin/bash
-
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-	wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
-	upload.sh Olive*.zip
-elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
-	find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
-	# curl --upload-file Olive*.AppImage https://transfer.sh/Olive-git.$(git rev-parse --short HEAD)-$ARCH.AppImage
-	wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
-	# only create release for master
-	if [ "$TRAVIS_BRANCH" != "master" ]; then
-		export TRAVIS_EVENT_TYPE=pull_request
-	fi
-	upload.sh Olive*.AppImage*
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+	wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+	upload.sh Olive*.zip
+elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
+	find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+	# curl --upload-file Olive*.AppImage https://transfer.sh/Olive-git.$(git rev-parse --short HEAD)-$ARCH.AppImage
+	wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+	# only create release for master
+	if [ "$TRAVIS_BRANCH" != "master" ]; then
+		export TRAVIS_EVENT_TYPE=pull_request
+	fi
+	upload.sh Olive*.AppImage*
 fi
\ No newline at end of file
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 2fb95c978..e117fc6d2 100644
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -1,9 +1,9 @@
-#!/bin/bash
-
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-	brew install ffmpeg qt5
-elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
-	sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
-	sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
-	sudo apt-get update -qq
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+	brew install ffmpeg qt5
+elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
+	sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
+	sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
+	sudo apt-get update -qq
 fi
\ No newline at end of file
diff --git a/.travis/script.sh b/.travis/script.sh
index 6a6612e68..ce40bfa8e 100644
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -1,30 +1,30 @@
-#!/bin/bash
-
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-	lrelease olive.pro
-	qmake CONFIG+=release PREFIX=/usr
-	make -j$(nproc)
-	macdeployqt Olive.app
-	zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
-elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
-	lrelease olive.pro
-	if [ "$ARCH" == "i386" ]; then
-		qmake CONFIG+=release "QMAKE_CFLAGS+=-m32" "QMAKE_CXXFLAGS+=-m32" "QMAKE_LFLAGS+=-m32" PREFIX=/usr -spec linux-g++-32; fi
-	else
-		qmake CONFIG+=release PREFIX=/usr
-	fi
-	make -j$(nproc)
-	make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
-	wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-	chmod a+x linuxdeployqt-continuous-x86_64.AppImage
-	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 -appimage
-	if [ "$ARCH" == "i386" ]; then
-		rm Olive*.AppImage
-		wget -c -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-i686.AppImage"
-		chmod a+x appimagetool-i686.AppImage
-		./appimagetool-i686.AppImage 'appdir' -n -g
-	fi
-fi
-
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+	lrelease olive.pro
+	qmake CONFIG+=release PREFIX=/usr
+	make -j$(nproc)
+	macdeployqt Olive.app
+	zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
+elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
+	lrelease olive.pro
+	if [ "$ARCH" == "i386" ]; then
+		qmake CONFIG+=release "QMAKE_CFLAGS+=-m32" "QMAKE_CXXFLAGS+=-m32" "QMAKE_LFLAGS+=-m32" PREFIX=/usr -spec linux-g++-32; fi
+	else
+		qmake CONFIG+=release PREFIX=/usr
+	fi
+	make -j$(nproc)
+	make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
+	wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+	chmod a+x linuxdeployqt-continuous-x86_64.AppImage
+	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 -appimage
+	if [ "$ARCH" == "i386" ]; then
+		rm Olive*.AppImage
+		wget -c -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-i686.AppImage"
+		chmod a+x appimagetool-i686.AppImage
+		./appimagetool-i686.AppImage 'appdir' -n -g
+	fi
+fi
+