aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Karlman <jonas@kwiboo.se>2017-01-14 13:29:52 +0100
committerJonas Karlman <jonas@kwiboo.se>2017-02-07 21:16:48 +0100
commit8c61adad271ad37ba9a086617a0be5923b65bd25 (patch)
treed4b790e128fd74bdc62d02b8bedbdd13004bb065
parent4c792dbb0a2b7ceddc79790123ef4d2572ca0fa1 (diff)
[linux] install <app-name>.desktop
-rw-r--r--cmake/scripts/linux/Install.cmake9
-rw-r--r--tools/Linux/kodi.desktop.in (renamed from tools/Linux/kodi.desktop)10
2 files changed, 12 insertions, 7 deletions
diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
index e2baab09f0..7c96e8f3ae 100644
--- a/cmake/scripts/linux/Install.cmake
+++ b/cmake/scripts/linux/Install.cmake
@@ -41,6 +41,10 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/KodiConfig.cmake.in
# Configure xsession entry
configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi-xsession.desktop.in
+ ${CORE_BUILD_DIR}/${APP_NAME_LC}-xsession.desktop @ONLY)
+
+# Configure desktop entry
+configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.desktop.in
${CORE_BUILD_DIR}/${APP_NAME_LC}.desktop @ONLY)
# Install app
@@ -78,12 +82,13 @@ foreach(file ${install_data})
endforeach()
# Install xsession entry
-install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${APP_NAME_LC}.desktop
+install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${APP_NAME_LC}-xsession.desktop
+ RENAME ${APP_NAME_LC}.desktop
DESTINATION ${datarootdir}/xsessions
COMPONENT kodi)
# Install desktop entry
-install(FILES ${CMAKE_SOURCE_DIR}/tools/Linux/kodi.desktop
+install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${APP_NAME_LC}.desktop
DESTINATION ${datarootdir}/applications
COMPONENT kodi)
diff --git a/tools/Linux/kodi.desktop b/tools/Linux/kodi.desktop.in
index 728958451c..fd8512da01 100644
--- a/tools/Linux/kodi.desktop
+++ b/tools/Linux/kodi.desktop.in
@@ -1,11 +1,11 @@
[Desktop Entry]
Version=1.0
-Name=Kodi
+Name=@APP_NAME@
GenericName=Media Center
Comment=Manage and view your media
Comment[ru]=Просмотр и управление мультимедиа
-Exec=kodi
-Icon=kodi
+Exec=@APP_NAME_LC@
+Icon=@APP_NAME_LC@
Terminal=false
Type=Application
Categories=AudioVideo;Video;Player;TV;
@@ -14,8 +14,8 @@ Actions=Fullscreen;Standalone;
[Desktop Action Fullscreen]
Name=Open in fullscreen
-Exec=kodi -fs
+Exec=@APP_NAME_LC@ -fs
[Desktop Action Standalone]
Name=Open in standalone mode
-Exec=kodi --standalone
+Exec=@APP_NAME_LC@ --standalone