From 2749afbb91116c5f45989d4ab0073acbebbf8c7d Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Fri, 22 Jun 2018 23:54:35 +0300
Subject: [PATCH] Fix the appimage generation

---
 .ci/bintray-release.json |  4 ++--
 .ci/install.sh           |  7 ++++---
 .ci/linux/deploy.sh      |  4 ++++
 .travis.yml              |  1 +
 appveyor.yml             | 20 ++++++--------------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.ci/bintray-release.json b/.ci/bintray-release.json
index 7115c910..ab6d17ba 100644
--- a/.ci/bintray-release.json
+++ b/.ci/bintray-release.json
@@ -5,14 +5,14 @@
       "matrixParams": {
         "override": 1
       },
-      "uploadPattern": "VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE.dmg"
+      "uploadPattern": "nheko/VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE.dmg"
     },
     {
       "includePattern": "nheko-VERSION_NAME_VALUE-x86_64.AppImage",
       "matrixParams": {
         "override": 1
       },
-      "uploadPattern": "VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE-x86_64.AppImage"
+      "uploadPattern": "nheko/VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE-x86_64.AppImage"
     }
   ],
   "package": {
diff --git a/.ci/install.sh b/.ci/install.sh
index ee172581..da5db114 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -5,7 +5,7 @@ set -ex
 if [ $TRAVIS_OS_NAME == osx ]; then
     brew update
     brew install qt5 lmdb clang-format ninja libsodium spdlog
-    brew upgrade boost
+    brew upgrade boost cmake
 
     curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
     sudo python get-pip.py
@@ -24,16 +24,17 @@ if [ $TRAVIS_OS_NAME == linux ]; then
         QT_PKG="59"
     fi
 
+    wget https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh
+    sudo sh cmake-3.11.4-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
+
     sudo add-apt-repository -y ppa:chris-lea/libsodium
     sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
-    sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
     sudo apt-get update -qq
     sudo apt-get install -qq -y \
         qt${QT_PKG}base \
         qt${QT_PKG}tools \
         qt${QT_PKG}svg \
         qt${QT_PKG}multimedia \
-        cmake \
         liblmdb-dev \
         libsodium-dev
 fi
diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh
index 7b5b8e4a..a721f2be 100755
--- a/.ci/linux/deploy.sh
+++ b/.ci/linux/deploy.sh
@@ -32,6 +32,10 @@ unset LD_LIBRARY_PATH
 
 export ARCH=$(uname -m)
 
+if [ ! -z $TRAVIS_TAG ]; then
+    export LD_LIBRARY_PATH=.deps/usr/lib/:/opt/qt${QT_PKG}/lib/:$LD_LIBRARY_PATH
+fi
+
 ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -bundle-non-qt-libs
 ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -appimage
 
diff --git a/.travis.yml b/.travis.yml
index 690f6690..a0ea4e92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,7 @@ before_install:
 
 install:
     - ./.ci/install.sh
+    - export PATH=/usr/local/bin:${PATH}
 
 script:
     - ./.ci/script.sh
diff --git a/appveyor.yml b/appveyor.yml
index 48c7e5cc..3b6c4af1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,10 @@ configuration: Release
 image: Visual Studio 2017
 platform: x64
 
+environment:
+    BINTRAY_APIKEY:
+        secure: "hhhAH6csIrPEVH92NNQkiGCkuON6l6sfhbZk+pvzDAM3vHex7YbqFKW6v5UjAS8v"
+
 cache: c:\tools\vcpkg\installed\
 
 build:
@@ -114,20 +118,8 @@ after_build:
 
     - mv nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
 
-deploy:
-    provider: BinTray
-    username: mujx
-    api_key:
-        secure: "hhhAH6csIrPEVH92NNQkiGCkuON6l6sfhbZk+pvzDAM3vHex7YbqFKW6v5UjAS8v"
-    subject: mujx
-    repo: matrix
-    package: nheko
-    version: $(APPVEYOR_REPO_TAG_NAME)
-    publish: true
-    override: true
-    artifact: nheko-$(APPVEYOR_REPO_TAG_NAME)-installer.exe
-    on:
-        appveyor_repo_tag: true
+on_success:
+    - if "%APPVEYOR_REPO_TAG%" == "true" (curl -T nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe -umujx:%BINTRAY_APIKEY% https://api.bintray.com/content/mujx/matrix/nheko/%APPVEYOR_REPO_TAG_NAME%/nheko/%APPVEYOR_REPO_TAG_NAME%/)
 
 artifacts:
     - path: nheko_win_64.zip