From 0d3ea8eaa5ecab5d52dcc08b28d51e669c52c7e6 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Fri, 3 Aug 2018 15:18:19 +0200
Subject: [PATCH] Use the kiwix.desktop file and the icon in the kiwix-desktop
 sources.

No need anymore to generate one or take a random image.
---
 scripts/create_kiwix-desktop_appImage.sh | 24 ++++++++----------------
 travis/compile_all.py                    |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/scripts/create_kiwix-desktop_appImage.sh b/scripts/create_kiwix-desktop_appImage.sh
index 8d26326..15cd6b7 100755
--- a/scripts/create_kiwix-desktop_appImage.sh
+++ b/scripts/create_kiwix-desktop_appImage.sh
@@ -3,10 +3,12 @@
 set -e
 
 INSTALLDIR=${1:-$PWD/BUILD_native_dyn/INSTALL}
-APPDIR=${2:-$PWD/AppDir}
+SOURCEDIR=${2:-$PWD/SOURCE/kiwix-desktop}
+APPDIR=${3:-$PWD/AppDir}
 
 #TODO We should have our icon
-ICONFILE=/usr/share/icons/hicolor/48x48/apps/gvim.png
+ICONFILE=$SOURCEDIR/resources/icons/kiwix/app_icon.svg
+DESKTOPFILE=$SOURCEDIR/kiwix.desktop
 
 # Create structure
 mkdir -p $APPDIR/usr/{bin,lib,share} $APPDIR/usr/share/applications $APPDIR/usr/share/icons/hicolor/48x48/apps
@@ -17,19 +19,9 @@ cp $INSTALLDIR/lib/x86_64-linux-gnu/*.so* $APPDIR/usr/lib
 rm $APPDIR/usr/lib/libmagic.so*
 # Copy nss lib (to not conflict with host's ones)
 cp -a /usr/lib/x86_64-linux-gnu/nss $APPDIR/usr/lib
-cp $ICONFILE $APPDIR/usr/share/icons/hicolor/48x48/apps/kiwix-desktop.png
-# TODO we should have our .desktop
-tee $APPDIR/usr/share/applications/kiwix-desktop.desktop <<EOF > /dev/null
-[Desktop Entry]
-Name=Kiwix
-Exec=kiwix-desktop %F
-Icon=kiwix-desktop
-Type=Application
-Terminal=false
-StartupNotify=true
-NoDisplay=false
-Categories=Education;
-EOF
+cp $ICONFILE $APPDIR/usr/share/icons/hicolor/48x48/apps/kiwix-desktop.svg
+mkdir -p $APPDIR/usr/share/applications
+cp $DESKTOPFILE $APPDIR/usr/share/applications/kiwix.desktop
 
 # Get linuxdeployqt
 wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
@@ -40,4 +32,4 @@ chmod a+x linuxdeployqt-continuous-x86_64.AppImage
 # Fix the RPATH of QtWebEngineProcess [TODO] Fill a issue ?
 patchelf --set-rpath '$ORIGIN/../lib' $APPDIR/usr/libexec/QtWebEngineProcess
 # Build the image.
-./linuxdeployqt-continuous-x86_64.AppImage $APPDIR/usr/share/applications/kiwix-desktop.desktop -verbose=3 -bundle-non-qt-libs -appimage   #
+./linuxdeployqt-continuous-x86_64.AppImage $APPDIR/usr/share/applications/kiwix.desktop -verbose=3 -bundle-non-qt-libs -appimage
diff --git a/travis/compile_all.py b/travis/compile_all.py
index f79c3ef..d4958fe 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -97,7 +97,7 @@ def run_kiwix_build(target, platform,
 
 def create_app_image():
     command = ['kiwix-build/scripts/create_kiwix-desktop_appImage.sh',
-               str(BASE_DIR/'INSTALL'), str(HOME/'AppDir')]
+               str(BASE_DIR/'INSTALL'), str(HOME/'SOURCE'/'kiwix-desktop'), str(HOME/'AppDir')]
     print_message("Build AppImage of kiwix-desktop")
     subprocess.check_call(command, cwd=str(HOME))
     if make_release: