From 1d1ce833c39249e447673db42e87f07bbc387b55 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Fri, 27 Nov 2020 06:18:57 +0100
Subject: [PATCH] Remove brew from macosx travis.

---
 resources/scripts/.travis-before-install.sh | 28 +++++++++++++--------
 resources/scripts/.travis-install-linux.sh  | 11 +++-----
 resources/scripts/.travis-install-osx.sh    | 17 -------------
 3 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/resources/scripts/.travis-before-install.sh b/resources/scripts/.travis-before-install.sh
index f53baa4ff..a40fd2590 100755
--- a/resources/scripts/.travis-before-install.sh
+++ b/resources/scripts/.travis-before-install.sh
@@ -4,25 +4,31 @@ git fetch --tags
 
 if test "$TRAVIS_OS_NAME" = "osx"; then
   # Mac OS X.
-  brew update
-#  brew install p7zip
-#  brew link --force p7zip
-  brew install curl
-  brew link --force curl
-  brew uninstall gnu-sed
-  brew install gnu-sed
-  brew link --force gnu-sed
-
   pip3 install aqtinstall
+  
+  # Install Qt.
+  QTPATH="$(pwd)/Qt"
+  QTVERSION="5.15.2"
+  QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
+
+  echo "Qt bin directory is: $QTBIN"
+  echo "Qt will be installed to: $QTPATH"
+
+  aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
+
+  export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
+  export PATH="$QTBIN:$PATH"
+
+  qmake --version
 elif test "$TRAVIS_OS_NAME" = "linux"; then
   # Linux.
   sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
   sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y
-  
+
   sudo apt-get update
   sudo apt-get -y install gcc-7 g++-7 qt514tools qt514base qt514webengine qt514svg
   sudo apt-get -y install openssl libssl-dev libgl1-mesa-dev 
-  
+
   sudo update-alternatives --remove-all gcc 
   sudo update-alternatives --remove-all g++
   sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 50
diff --git a/resources/scripts/.travis-install-linux.sh b/resources/scripts/.travis-install-linux.sh
index da76f1dce..98e007968 100755
--- a/resources/scripts/.travis-install-linux.sh
+++ b/resources/scripts/.travis-install-linux.sh
@@ -1,17 +1,13 @@
 #!/bin/bash
 
-ls -lha
-
-# Setup Qt build environment.
 source /opt/qt514/bin/qt514-env.sh
-mkdir rssguard-build && cd rssguard-build
 
 # Build application.
-#lrelease -compress ../rssguard.pro
+mkdir rssguard-build && cd rssguard-build
 qmake .. "USE_WEBENGINE=$USE_WEBENGINE"
 make
 make install
-cd src/rssguard
+cd "src/rssguard"
 
 # Obtain linuxdeployqt.
 wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
@@ -44,5 +40,4 @@ else
 fi
 
 mv "$imagename" "$imagenewname"
-
-ls
+ls
\ No newline at end of file
diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh
index 76d7f4f17..6cf55193c 100755
--- a/resources/scripts/.travis-install-osx.sh
+++ b/resources/scripts/.travis-install-osx.sh
@@ -1,27 +1,10 @@
 #!/bin/sh
 
-# Install Qt.
-QTPATH="$(pwd)/Qt"
-QTVERSION="5.15.2"
-QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
-
-echo "Qt bin directory is: $QTBIN"
-echo "Qt will be installed to: $QTPATH"
-
-aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
-
-export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
-export PATH="$QTBIN:$PATH"
-
-qmake --version
-
 # Build application.
 mkdir rssguard-build && cd rssguard-build
 qmake .. "USE_WEBENGINE=$USE_WEBENGINE"
 make
 make install
-
-# Make DMG image.
 cd "src/rssguard"
 
 # Fix .dylib linking.