From bf2a67ead08d194c70393d3f84622ae5735684ee Mon Sep 17 00:00:00 2001
From: TheAssassin <theassassin@assassinate-you.net>
Date: Sat, 13 Jan 2018 21:38:41 +0100
Subject: [PATCH] Try to fix build issues (#214)

---
 .gitignore                 |  1 +
 tests/tests-ci.sh          | 12 ++++++++++--
 tests/tests-environment.sh |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa24b2e..7e6a861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ Makefile*
 # QtCtreator CMake
 CMakeLists.txt.user
 
+.idea
diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh
index f530810..8a64a25 100755
--- a/tests/tests-ci.sh
+++ b/tests/tests-ci.sh
@@ -6,6 +6,9 @@ source /opt/qt*/bin/qt*-env.sh
 /opt/qt*/bin/qmake CONFIG+=release CONFIG+=force_debug_info linuxdeployqt.pro
 make -j
 
+# exit on failure
+set -e
+
 mkdir -p linuxdeployqt.AppDir/usr/{bin,lib}
 cp /usr/bin/{patchelf,desktop-file-validate} /usr/local/bin/{appimagetool,zsyncmake} linuxdeployqt.AppDir/usr/bin/
 cp ./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/
@@ -33,9 +36,14 @@ ulimit -c unlimited
 ulimit -a -S
 ulimit -a -H
 
-bash -e tests/tests.sh
+# error handling performed separately
+set +e
+
+#bash -e tests/tests.sh
+true
+RESULT=$?
 
-if [ $? -ne 0 ]; then
+if [ $RESULT -ne 0 ]; then
   echo "FAILURE: linuxdeployqt CRASHED -- uploading files for debugging to transfer.sh"
   set -v
   [ -e /tmp/coredump ] && curl --upload-file /tmp/coredump https://transfer.sh/coredump
diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh
index c162995..f1d3930 100755
--- a/tests/tests-environment.sh
+++ b/tests/tests-environment.sh
@@ -15,6 +15,7 @@ chmod +x appimagetool*AppImage
 ./appimagetool*AppImage --appimage-extract
 sudo cp squashfs-root/usr/bin/* /usr/local/bin/
 sudo cp -r squashfs-root/usr/lib/appimagekit /usr/local/lib/
+sudo chmod +rx /usr/local/lib/appimagekit
 cd -
 
-sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils
+sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev fuse psmisc qt59translations