From ecd67b9d758ba23c17e4718031da2fe398d1ff38 Mon Sep 17 00:00:00 2001
From: Eugene Shalygin <eugene.shalygin@gmail.com>
Date: Wed, 12 Apr 2017 17:15:27 +0200
Subject: [PATCH] Rename .desktop and appdata files to match executable name.
 Fixes #6625.

---
 dist/unix/CMakeLists.txt                      | 26 ++++++++++---------
 ...nt.appdata.xml => qbittorrent.appdata.xml} |  2 +-
 ...Bittorrent.desktop => qbittorrent.desktop} |  0
 unixconf.pri                                  |  4 +--
 4 files changed, 17 insertions(+), 15 deletions(-)
 rename dist/unix/{qBittorrent.appdata.xml => qbittorrent.appdata.xml} (98%)
 rename src/icons/{qBittorrent.desktop => qbittorrent.desktop} (100%)

diff --git a/dist/unix/CMakeLists.txt b/dist/unix/CMakeLists.txt
index c8dbf25d7..f625cbc20 100644
--- a/dist/unix/CMakeLists.txt
+++ b/dist/unix/CMakeLists.txt
@@ -20,18 +20,20 @@ install(FILES ${MAN_FILES}
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
         COMPONENT doc)
 
-install(DIRECTORY menuicons/
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
-        FILES_MATCHING PATTERN "*.png")
+if (GUI)
+    install(DIRECTORY menuicons/
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
+            FILES_MATCHING PATTERN "*.png")
 
-install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.png
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/
-        COMPONENT data)
+    install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.png
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/
+            COMPONENT data)
 
-install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qBittorrent.desktop
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
-        COMPONENT data)
+    install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.desktop
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
+            COMPONENT data)
 
-install(FILES qBittorrent.appdata.xml
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/
-        COMPONENT data)
+    install(FILES qbittorrent.appdata.xml
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/
+            COMPONENT data)
+endif()
diff --git a/dist/unix/qBittorrent.appdata.xml b/dist/unix/qbittorrent.appdata.xml
similarity index 98%
rename from dist/unix/qBittorrent.appdata.xml
rename to dist/unix/qbittorrent.appdata.xml
index bb7864d23..8d3214ad0 100644
--- a/dist/unix/qBittorrent.appdata.xml
+++ b/dist/unix/qbittorrent.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 sledgehammer999 <sledgehammer999@qbittorrent.org> -->
 <component type="desktop">
-  <id>qBittorrent.desktop</id>
+  <id>qbittorrent.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0 and OpenSSL</project_license>
   <name>qBittorrent</name>
diff --git a/src/icons/qBittorrent.desktop b/src/icons/qbittorrent.desktop
similarity index 100%
rename from src/icons/qBittorrent.desktop
rename to src/icons/qbittorrent.desktop
diff --git a/unixconf.pri b/unixconf.pri
index f2efd2b30..27166909a 100644
--- a/unixconf.pri
+++ b/unixconf.pri
@@ -39,11 +39,11 @@ nogui:systemd {
 
 # Menu Icon
 !nogui {
-    menuicon.files = icons/qBittorrent.desktop
+    menuicon.files = icons/qbittorrent.desktop
     menuicon.path = $$DATADIR/applications/
     INSTALLS += menuicon
 
-    appdata.files = $$DIST_PATH/qBittorrent.appdata.xml
+    appdata.files = $$DIST_PATH/qbittorrent.appdata.xml
     appdata.path = $$DATADIR/appdata/
     INSTALLS += appdata