From 44fbaa62a6c1114bc8f35dcedd77011497b0b946 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Fri, 7 Jul 2017 23:40:28 +0200
Subject: [PATCH 01/24] Use linuxdeployqt

---
 linux/AppImage/build-appimage.sh | 72 +++++++-------------------------
 1 file changed, 16 insertions(+), 56 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 6200f45..ed126ff 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -22,97 +22,57 @@ cd qtkeychain
 git checkout v0.8.0
 mkdir build
 cd build
-cmake -D CMAKE_INSTALL_PREFIX=/app ../
+cmake cmake .. -DCMAKE_INSTALL_PREFIX=/usr
 make -j4
-make install
+make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
 
 #Build client
 cd 
 mkdir build-client
 cd build-client
-cmake -D CMAKE_INSTALL_PREFIX=/app \
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -D NO_SHIBBOLETH=1 \
     -D OEM_THEME_DIR=/home/client/nextcloudtheme \
     -DMIRALL_VERSION_SUFFIX=beta \
     -DMIRALL_VERSION_BUILD=14 \
     /home/client/client
 make -j4
-make install
-
-#Create skeleton
-mkdir -p $HOME/$APP/$APP.AppDir/usr/
-cd $HOME/$APP/
-
-#Fetch appimage functions
-wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh
-. ./functions.sh
+make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
 
 cd $APP.AppDir
 
-#clean binary
-sed -i -e 's|/app|././|g' /app/bin/nextcloud
-
-# Copy installed stuff
-cp -r /app/* ./usr/
-
-get_apprun
-
-cp /app/share/applications/nextcloud.desktop .
 cp /app/share/icons/hicolor/256x256/apps/Nextcloud.png nextcloud.png
 
-#Copy qt plugins
-mkdir -p ./usr/lib/qt5/plugis
-cp -r /opt/qt58/plugins ./usr/lib/qt5/plugins
-
-#Copy dependencies
-copy_deps
-
-delete_blacklisted
-
 # We don't bundle the developer stuff
 rm -rf usr/include || true
 rm -rf usr/lib/cmake || true
 rm -rf usr/lib/pkgconfig || true
 find . -name '*.la' | xargs -i rm {}
-strip usr/bin/* usr/lib/* || true
-rm -rf app/ || true
-# Copy, since libssl must be in sync with libcrypto
-cp /lib/x86_64-linux-gnu/libssl.so.1.0.0 usr/lib/
-# No need to add CMake stuff
 rm -rf usr/lib/x86_64-linux-gnu/cmake/
 rm -rf usr/mkspecs
+
 # Don't bundle nextcloudcmd as we don't run it anyway
 rm usr/bin/nextcloudcmd
+
 # Don't bundle the explorer extentions as we can't do anything with them in the AppImage
 rm -rf usr/share/caja-python/
 rm -rf usr/share/nautilus-python/
 rm -rf usr/share/nemo-python/
 
-#Move qt5.8 libs to the right location
-mv ./opt/qt58/lib/* ./usr/lib/
-rm -rf ./opt/
-
-#Move sync exlucde to right location
+# Move sync exlucde to right location
 mv ./usr/etc/Nextcloud/sync-exclude.lst ./usr/bin/
 rm -rf ./usr/etc
 
-#desktop intergration
-get_desktopintegration $LOWERAPP
-
-#Generate the appimage
 cd ..
-wget -c https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
-chmod +x appimagetool-x86_64.AppImage
-./appimagetool-x86_64.AppImage --appimage-extract
 
-mkdir -p ../out/
-GLIBC_NEEDED=$(glibc_needed)
-APPIMAGE_FILENAME=${APP}-${VERSION}-${ARCH}.glibc$GLIBC_NEEDED.AppImage
-APPIMAGE_PATH=../out/$APPIMAGE_FILENAME
+# Use linuxdeployqt to deploy
+wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
+chmod a+x linuxdeployqt*.AppImage
+unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  
+./linuxdeployqt*.AppImage $(readlink -f $HOME/$APP/$APP.AppDir)/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
+./linuxdeployqt*.AppImage $(readlink -f $HOME/$APP/$APP.AppDir)/usr/share/applications/nextcloud.desktop -appimage
 
-./squashfs-root/AppRun -n -v $APP.AppDir $APPIMAGE_PATH
+ls *.AppImage
 
-#move appimage
-chown $SUDO_UID:$SUDO_GID ../out/*.AppImage
-mkdir -p /home/client/out
-mv ../out/*.AppImage /home/client/out/
+mv ./Nextcloud*.AppImage /home/client/out/

From 91540f798a6e62b3168766e7ef3eee71c5aa57db Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Fri, 7 Jul 2017 23:44:29 +0200
Subject: [PATCH 02/24] Extract linuxdeployqt AppImage since running in Docker

---
 linux/AppImage/build-appimage.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index ed126ff..d2a2549 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -68,10 +68,11 @@ cd ..
 # Use linuxdeployqt to deploy
 wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
 chmod a+x linuxdeployqt*.AppImage
+./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
   
-./linuxdeployqt*.AppImage $(readlink -f $HOME/$APP/$APP.AppDir)/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
-./linuxdeployqt*.AppImage $(readlink -f $HOME/$APP/$APP.AppDir)/usr/share/applications/nextcloud.desktop -appimage
+./squashfs-root/AppRun $(readlink -f $HOME/$APP/$APP.AppDir)/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
+./squashfs-root/AppRun $(readlink -f $HOME/$APP/$APP.AppDir)/usr/share/applications/nextcloud.desktop -appimage
 
 ls *.AppImage
 

From 8e2fe19d30736f3142eed3280795e22053d8170c Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 8 Jul 2017 02:16:08 +0200
Subject: [PATCH 03/24] Exit on errors so that the Travis CI status indicator
 works

---
 linux/AppImage/build-appimage.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index d2a2549..d88cc0a 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+set +e # Exit on errors so that the Travis CI status indicator works
+
 export SUDO_UID=${SUDO_UID:-1000}
 export SUDO_GID=${SUDO_GID:-1000}
 
@@ -41,7 +43,7 @@ make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
 
 cd $APP.AppDir
 
-cp /app/share/icons/hicolor/256x256/apps/Nextcloud.png nextcloud.png
+cp usr/share/icons/hicolor/256x256/apps/Nextcloud.png nextcloud.png
 
 # We don't bundle the developer stuff
 rm -rf usr/include || true

From eb2e039a84859be39211b1567d5f7d20fa0d3dc8 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 8 Jul 2017 21:09:02 +0200
Subject: [PATCH 04/24] Fix error

---
 linux/AppImage/build-appimage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index d88cc0a..7240e0c 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -24,7 +24,7 @@ cd qtkeychain
 git checkout v0.8.0
 mkdir build
 cd build
-cmake cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr
 make -j4
 make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
 

From 89377848f91559354a34d9dd34fb0bed16d34ed1 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 8 Jul 2017 21:32:09 +0200
Subject: [PATCH 05/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 7240e0c..cd7409f 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -2,12 +2,7 @@
 
 set +e # Exit on errors so that the Travis CI status indicator works
 
-export SUDO_UID=${SUDO_UID:-1000}
-export SUDO_GID=${SUDO_GID:-1000}
-
 export APP=Nextcloud
-export LOWERAPP=${APP,,}
-export ARCH=x86_64
 export VERSION=2.3.2-beta
 
 #Set Qt-5.8
@@ -18,7 +13,6 @@ export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LI
 export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
 
 #QtKeyChain 0.8.0
-cd 
 git clone https://github.com/frankosterfeld/qtkeychain.git
 cd qtkeychain
 git checkout v0.8.0
@@ -29,7 +23,6 @@ make -j4
 make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
 
 #Build client
-cd 
 mkdir build-client
 cd build-client
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -43,8 +36,6 @@ make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
 
 cd $APP.AppDir
 
-cp usr/share/icons/hicolor/256x256/apps/Nextcloud.png nextcloud.png
-
 # We don't bundle the developer stuff
 rm -rf usr/include || true
 rm -rf usr/lib/cmake || true

From 3d5d3ba25fcb2743beb9a8d17ef3b06b9c62fd03 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 9 Jul 2017 01:02:21 +0200
Subject: [PATCH 06/24] set -e

---
 linux/AppImage/build-appimage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index cd7409f..7c35ebf 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-set +e # Exit on errors so that the Travis CI status indicator works
+set -e # Exit on errors so that the Travis CI status indicator works
 
 export APP=Nextcloud
 export VERSION=2.3.2-beta

From a96ebd120d19e970066f1387629517ae73e4e5da Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 9 Jul 2017 10:40:42 +0200
Subject: [PATCH 07/24] Change path to build-appimage.sh

---
 linux/travis-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/travis-build.sh b/linux/travis-build.sh
index 9da9f70..d5bb2a1 100755
--- a/linux/travis-build.sh
+++ b/linux/travis-build.sh
@@ -18,7 +18,7 @@ function docker_exec() {
 
 if [ "$BUILD_TYPE" == "appimage" ]; then
     if [ "$TRAVIS_BUILD_STEP" == "script" ]; then
-        $THIS_PATH/appimage-build.sh
+        $THIS_PATH/AppImage/build-appimage.sh
     fi
 elif [ "$BUILD_TYPE" == "snap" ]; then
     if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then

From f6a72fb05758cd24e4bf9927acede2dcccb0553c Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 9 Jul 2017 10:43:59 +0200
Subject: [PATCH 08/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 7c35ebf..d4da0f5 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -69,4 +69,16 @@ unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
 
 ls *.AppImage
 
-mv ./Nextcloud*.AppImage /home/client/out/
+# mv ./Nextcloud*.AppImage /home/client/out/
+
+########################################################################
+# Upload the AppDir
+########################################################################
+
+if [ -n "$GITHUB_TOKEN" ]; then
+  wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  bash upload.sh $(readlink -f ./Nextcloud*.AppImage)
+else
+  curl --upload-file $(readlink -f ./Nextcloud*.AppImage) https://transfer.sh/Nextcloud-$VERSION-x86_64.AppImage
+  echo "AppImage has been uploaded to the URL above"
+fi

From 26c08cf232085a3b7fe2a6fd358514625561d4e6 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 9 Jul 2017 10:45:18 +0200
Subject: [PATCH 09/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index d4da0f5..2ecdaa4 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -13,14 +13,14 @@ export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LI
 export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
 
 #QtKeyChain 0.8.0
-git clone https://github.com/frankosterfeld/qtkeychain.git
-cd qtkeychain
-git checkout v0.8.0
-mkdir build
-cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-make -j4
-make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
+#git clone https://github.com/frankosterfeld/qtkeychain.git
+#cd qtkeychain
+#git checkout v0.8.0
+#mkdir build
+#cd build
+#cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+#make -j4
+#make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
 
 #Build client
 mkdir build-client

From b75002a329a96c5e8adfd7071bc4becafbd7e052 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 9 Jul 2017 11:06:43 +0200
Subject: [PATCH 10/24] Remove hardcoded $HOME paths

---
 linux/AppImage/build-appimage.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 2ecdaa4..ca58831 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -27,12 +27,11 @@ mkdir build-client
 cd build-client
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -D NO_SHIBBOLETH=1 \
-    -D OEM_THEME_DIR=/home/client/nextcloudtheme \
+    -D OEM_THEME_DIR=../nextcloudtheme \
     -DMIRALL_VERSION_SUFFIX=beta \
-    -DMIRALL_VERSION_BUILD=14 \
-    /home/client/client
+    -DMIRALL_VERSION_BUILD=14 ..
 make -j4
-make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
+make DESTDIR=$(readlink -f $APP.AppDir) install
 
 cd $APP.AppDir
 

From 56aac9bcc803daaaf61d2853ca03af24b194ea97 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 9 Jul 2017 15:19:44 +0200
Subject: [PATCH 11/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index ca58831..2f79aa0 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -29,7 +29,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -D NO_SHIBBOLETH=1 \
     -D OEM_THEME_DIR=../nextcloudtheme \
     -DMIRALL_VERSION_SUFFIX=beta \
-    -DMIRALL_VERSION_BUILD=14 ..
+    -DMIRALL_VERSION_BUILD=14 ../client/
 make -j4
 make DESTDIR=$(readlink -f $APP.AppDir) install
 

From a66d7129d1ce1b6aa2aae11eb7538cdb37457573 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 9 Jul 2017 20:38:07 +0200
Subject: [PATCH 12/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 2f79aa0..5049f29 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -5,12 +5,12 @@ set -e # Exit on errors so that the Travis CI status indicator works
 export APP=Nextcloud
 export VERSION=2.3.2-beta
 
-#Set Qt-5.8
-export QT_BASE_DIR=/opt/qt58
-export QTDIR=$QT_BASE_DIR
-export PATH=$QT_BASE_DIR/bin:$PATH
-export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
-export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
+sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
+sudo apt-key add - < Release.key
+sudo apt-get update
+sudo apt-get -y build-dep owncloud-client
 
 #QtKeyChain 0.8.0
 #git clone https://github.com/frankosterfeld/qtkeychain.git
@@ -22,18 +22,15 @@ export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
 #make -j4
 #make DESTDIR=$(readlink -f $HOME/$APP/$APP.AppDir) install
 
-#Build client
-mkdir build-client
-cd build-client
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -D NO_SHIBBOLETH=1 \
-    -D OEM_THEME_DIR=../nextcloudtheme \
-    -DMIRALL_VERSION_SUFFIX=beta \
-    -DMIRALL_VERSION_BUILD=14 ../client/
-make -j4
+git submodule update --init --recursive
+mkdir build-linux
+cd build-linux
+cmake -D CMAKE_INSTALL_PREFIX=/usr -D OEM_THEME_DIR=`pwd`/../nextcloudtheme ../client
+make
 make DESTDIR=$(readlink -f $APP.AppDir) install
 
 cd $APP.AppDir
+find .
 
 # We don't bundle the developer stuff
 rm -rf usr/include || true

From 419e965f449a7e906c5b5bc263fa06397d26478d Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 22 Jul 2017 22:52:58 +0200
Subject: [PATCH 13/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 5049f29..a0f50dd 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -49,8 +49,8 @@ rm -rf usr/share/nautilus-python/
 rm -rf usr/share/nemo-python/
 
 # Move sync exlucde to right location
-mv ./usr/etc/Nextcloud/sync-exclude.lst ./usr/bin/
-rm -rf ./usr/etc
+mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
+rm -rf ./etc
 
 cd ..
 

From d65624d1930d37a83c72d14f83de71ccd6509404 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 22 Jul 2017 23:12:52 +0200
Subject: [PATCH 14/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index a0f50dd..984cdce 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -60,8 +60,8 @@ chmod a+x linuxdeployqt*.AppImage
 ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
   
-./squashfs-root/AppRun $(readlink -f $HOME/$APP/$APP.AppDir)/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
-./squashfs-root/AppRun $(readlink -f $HOME/$APP/$APP.AppDir)/usr/share/applications/nextcloud.desktop -appimage
+./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
+./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -appimage
 
 ls *.AppImage
 

From fe500533672071002d25af3f8952b5012cef06c2 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 22 Jul 2017 23:23:12 +0200
Subject: [PATCH 15/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 984cdce..a484ce5 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -30,7 +30,9 @@ make
 make DESTDIR=$(readlink -f $APP.AppDir) install
 
 cd $APP.AppDir
-find .
+
+# Why on earth...
+mv ./usr/lib/x86_64-linux-gnu/nextcloud/* ./usr/lib/x86_64-linux-gnu/ ; rm -rf ./usr/lib/x86_64-linux-gnu/nextcloud
 
 # We don't bundle the developer stuff
 rm -rf usr/include || true
@@ -52,6 +54,8 @@ rm -rf usr/share/nemo-python/
 mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
 rm -rf ./etc
 
+find .
+
 cd ..
 
 # Use linuxdeployqt to deploy

From 86634f96aedfea259751a64416643fbe54f030ef Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 22 Jul 2017 23:30:23 +0200
Subject: [PATCH 16/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index a484ce5..e00ea5c 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -63,7 +63,8 @@ wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous
 chmod a+x linuxdeployqt*.AppImage
 ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  
+export LD_LIBRARY_PATH=$APP.AppDir/usr/lib/x86_64-linux-gnu/
+
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -appimage
 

From 85d5d1b487af5a101b0881b3e5193e94d7202911 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 22 Jul 2017 23:52:33 +0200
Subject: [PATCH 17/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index e00ea5c..f90951f 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -54,6 +54,8 @@ rm -rf usr/share/nemo-python/
 mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
 rm -rf ./etc
 
+sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' usr/share/applications/nextcloud.desktop
+
 find .
 
 cd ..

From e576f6ca8f49903aacfbaad792312ce351ca0e34 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 23 Jul 2017 00:01:50 +0200
Subject: [PATCH 18/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index f90951f..804d11f 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -54,7 +54,8 @@ rm -rf usr/share/nemo-python/
 mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
 rm -rf ./etc
 
-sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' usr/share/applications/nextcloud.desktop
+sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' usr/share/applications/nextcloud.desktop # Bug in desktop file?
+cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linuxeployqt bug, FIXME
 
 find .
 

From c0e3cae3af742d5ba5f100c7ffd81d9421c8cdaf Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sun, 23 Jul 2017 00:18:32 +0200
Subject: [PATCH 19/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 804d11f..d43d821 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -79,7 +79,7 @@ ls *.AppImage
 # Upload the AppDir
 ########################################################################
 
-if [ -n "$GITHUB_TOKEN" ]; then
+if [ "false" == "$TRAVIS_PULL_REQUEST" ]; then
   wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
   bash upload.sh $(readlink -f ./Nextcloud*.AppImage)
 else

From d264873748030085ba83fb9217aa14b6de50c3a4 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Tue, 1 Aug 2017 14:20:30 +0200
Subject: [PATCH 20/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index d43d821..c1781a2 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -69,6 +69,11 @@ unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$APP.AppDir/usr/lib/x86_64-linux-gnu/
 
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
+
+# Why on earth part two...
+mv usr/lib/x86_64-linux-gnu/* usr/lib/
+find usr/lib/libnextcloudsync.so* -type f -exec patchelf  --set-rpath '$ORIGIN/' {} \;
+
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -appimage
 
 ls *.AppImage

From bbe52d2d09b6860911eb249da9acafbec86716e0 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Tue, 1 Aug 2017 19:02:44 +0200
Subject: [PATCH 21/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index c1781a2..5f74e5c 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -71,8 +71,8 @@ export LD_LIBRARY_PATH=$APP.AppDir/usr/lib/x86_64-linux-gnu/
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
 
 # Why on earth part two...
-mv usr/lib/x86_64-linux-gnu/* usr/lib/
-find usr/lib/libnextcloudsync.so* -type f -exec patchelf  --set-rpath '$ORIGIN/' {} \;
+mv $APP.AppDir/usr/lib/x86_64-linux-gnu/* $APP.AppDir/usr/lib/
+find $APP.AppDir/usr/lib/libnextcloudsync.so* -type f -exec patchelf  --set-rpath '$ORIGIN/' {} \;
 
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -appimage
 

From 0f3028c55b659be032c3749e83702ceba2640229 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Tue, 1 Aug 2017 19:10:33 +0200
Subject: [PATCH 22/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 5f74e5c..26ba9c8 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -66,7 +66,7 @@ wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous
 chmod a+x linuxdeployqt*.AppImage
 ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$APP.AppDir/usr/lib/x86_64-linux-gnu/
+export LD_LIBRARY_PATH=$APP.AppDir/usr/lib/x86_64-linux-gnu/:$APP.AppDir/usr/lib/
 
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
 

From 25f05785a7c95f835247680dec70de83a9b8a67c Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Tue, 1 Aug 2017 19:24:34 +0200
Subject: [PATCH 23/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index 26ba9c8..c504b2b 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -72,7 +72,7 @@ export LD_LIBRARY_PATH=$APP.AppDir/usr/lib/x86_64-linux-gnu/:$APP.AppDir/usr/lib
 
 # Why on earth part two...
 mv $APP.AppDir/usr/lib/x86_64-linux-gnu/* $APP.AppDir/usr/lib/
-find $APP.AppDir/usr/lib/libnextcloudsync.so* -type f -exec patchelf  --set-rpath '$ORIGIN/' {} \;
+patchelf --set-rpath '$ORIGIN/' $APP.AppDir/usr/lib/libnextcloudsync.so.0
 
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -appimage
 

From 24b1670b821c5d57c374bbb6294ebbb1a30d0062 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Tue, 1 Aug 2017 19:50:38 +0200
Subject: [PATCH 24/24] Update build-appimage.sh

---
 linux/AppImage/build-appimage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/AppImage/build-appimage.sh b/linux/AppImage/build-appimage.sh
index c504b2b..2b6c15c 100755
--- a/linux/AppImage/build-appimage.sh
+++ b/linux/AppImage/build-appimage.sh
@@ -72,7 +72,7 @@ export LD_LIBRARY_PATH=$APP.AppDir/usr/lib/x86_64-linux-gnu/:$APP.AppDir/usr/lib
 
 # Why on earth part two...
 mv $APP.AppDir/usr/lib/x86_64-linux-gnu/* $APP.AppDir/usr/lib/
-patchelf --set-rpath '$ORIGIN/' $APP.AppDir/usr/lib/libnextcloudsync.so.0
+./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' $APP.AppDir/usr/lib/libnextcloudsync.so.0
 
 ./squashfs-root/AppRun $APP.AppDir/usr/share/applications/nextcloud.desktop -appimage