script: linux deinstall script fix

* linux deinstall script replaced / with -
* added categories in sourcetrail.desktop

CMakeLists.txt

@@ -712,6 +712,12 @@ if (UNIX)
 	)
 
 	if (UNIX AND NOT APPLE)
+		# Create different sized icons
+		message(STATUS "create icons")
+		execute_process(
+			COMMAND "${CMAKE_SOURCE_DIR}/setup/Linux/createIcons.sh" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}"
+		)
+
 		# Linux package
 		include(cmake/LinuxPackage.cmake)
 	endif ()

cmake/LinuxPackage.cmake

@@ -73,7 +73,6 @@ function(AddSharedToComponent componentName)
 	GetAndInstallLibrary(libselinux.so ${componentName})
 	GetAndInstallLibrary(libXrender.so ${componentName})
 	#GetAndInstallLibrary(libstdc++.so ${componentName})
-
 	GetAndInstallLibrary(libX11-xcb.so ${componentName})
 	GetAndInstallLibrary(libXi.so ${componentName})
 	GetAndInstallLibrary(libxcb.so ${componentName})
@@ -97,11 +96,13 @@ function(AddSharedToComponent componentName)
 	GetAndInstallLibrary(libdrm.so ${componentName})
 	GetAndInstallLibrary(libXau.so ${componentName})
 
-	INSTALL(DIRECTORY
-		$ENV{QT_DIR}/plugins/platforms
-		DESTINATION Sourcetrail/lib
-		COMPONENT ${componentName}
-	)
+	if ( $ENV{QT_DIR})
+		INSTALL(DIRECTORY
+			$ENV{QT_DIR}/plugins/platforms
+			DESTINATION Sourcetrail/lib
+			COMPONENT ${componentName}
+		)
+	endif()
 
 	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/user
 		DESTINATION Sourcetrail
@@ -125,6 +126,12 @@ INSTALL(DIRECTORY
 	PATTERN "vs" EXCLUDE
 )
 
+INSTALL(DIRECTORY
+	${CMAKE_BINARY_DIR}/share
+	DESTINATION Sourcetrail/setup
+	COMPONENT FULL
+)
+
 INSTALL(FILES
 	${CMAKE_SOURCE_DIR}/setup/Linux/README
 	DESTINATION Sourcetrail
@@ -132,11 +139,16 @@ INSTALL(FILES
 )
 
 INSTALL(FILES
-	${CMAKE_SOURCE_DIR}/setup/Linux/sourcetrail.desktop
 	${CMAKE_SOURCE_DIR}/setup/Linux/sourcetrail-mime.xml
-	DESTINATION Sourcetrail/setup
+	DESTINATION Sourcetrail/setup/share/mime/packages
 	COMPONENT FULL
-	)
+)
+
+INSTALL(FILES
+	${CMAKE_SOURCE_DIR}/setup/Linux/sourcetrail.desktop
+	DESTINATION Sourcetrail/setup/share/applications
+	COMPONENT FULL
+)
 
 INSTALL(PROGRAMS
 	${CMAKE_SOURCE_DIR}/setup/Linux/install.sh

setup/Linux/createIcons.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+SOURCE_DIR=$1
+BUILD_DIR=$2
+ICON=$SOURCE_DIR/bin/app/data/gui/icon/logo_1024_1024.png
+HICOLOR_DIR=$BUILD_DIR/share/icons/hicolor
+
+echo "sourcedir: $SOURCE_DIR"
+echo "builddir : $BUILD_DIR"
+echo "hicolor  : $HICOLOR_DIR"
+echo "icon     : $ICON"
+
+createIcon()
+{
+    mkdir -p $HICOLOR_DIR/$1/apps/
+    convert $ICON -resize $1 $HICOLOR_DIR/$1/apps/sourcetrail.png
+}
+
+createIcon 512x512
+createIcon 256x256
+createIcon 128x128
+createIcon 64x64
+createIcon 48x48

setup/Linux/deinstall.sh

@@ -15,6 +15,6 @@ rm /usr/share/applications/sourcetrail.desktop
 rm /usr/share/icons/sourcetrail.png
 rm /usr/share/icons/project-sourcetrail.png
 rm /opt/sourcetrail -rf
-update-mime/database /usr/share/mime
+update-mime-database /usr/share/mime
 update-desktop-database
 

setup/Linux/install.sh

@@ -10,8 +10,7 @@ case ${ans:=y} in [yY]*) ;; *) exit ;; esac
 echo "Run this script as root"
 
 cp -rf $MY_PATH/ /opt/sourcetrail/ > /dev/null
-cp $MY_PATH/setup/sourcetrail-mime.xml /usr/share/mime/packages > /dev/null
-cp $MY_PATH/setup/sourcetrail.desktop /usr/share/applications/ > /dev/null
+cp -rf $MY_PATH/setup/share/ /usr > /dev/null
 cp $MY_PATH/data/gui/icon/logo_1024_1024.png /usr/share/icons/sourcetrail.png > /dev/null
 cp $MY_PATH/data/gui/icon/project_256_256.png /usr/share/icons/project-sourcetrail.png > /dev/null
 update-mime-database /usr/share/mime > /dev/null

setup/Linux/sourcetrail.desktop

@@ -8,4 +8,5 @@ Icon=sourcetrail
 Terminal=true
 Type=Application
 MimeType=application/x-sourcetrail;
+Categories=Development;IDE;Utilities;
 StartupNotify=true