build: Revised Linux install package

* renamed scripts
* moved install, uninstall, deleteConfig scripts to top-level
* fixed desktop file not recognized on installation, only on restart
* removed Eula accept from install script
* abort install and uninstall when not running as root
* revised README

CMakeLists.txt

@@ -628,6 +628,7 @@ target_include_directories(${LICENSE_GENERATOR_PROJECT_NAME} SYSTEM
 
 if(UNIX AND NOT APPLE)
 	target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} pthread rt)
+	set_target_properties(${LICENSE_GENERATOR_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "-pthread")
 endif()
 
 target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${Boost_LIBRARIES} )

cmake/linux_package.cmake

@@ -53,7 +53,7 @@ function(AddSharedToComponent)
 		PATTERN "projects" EXCLUDE
 		PATTERN "data/install" EXCLUDE
 		PATTERN "ProjectSettings_template.xml" EXCLUDE
-		PATTERN "ApplicationSettings_template.xml" EXCLUDE
+		PATTERN "color_scheme_template.xml" EXCLUDE
 	)
 
 	INSTALL(FILES
@@ -105,10 +105,7 @@ function(AddSharedToComponent)
 	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/user
 		DESTINATION Sourcetrail
 		PATTERN "ApplicationSettings.xml" EXCLUDE
-		PATTERN "ApplicationSettings_for_package.xml" EXCLUDE
-		PATTERN "ProjectSettings_template.xml" EXCLUDE
 		PATTERN "ApplicationSettings_template.xml" EXCLUDE
-		PATTERN "window_settings_for_package.ini" EXCLUDE
 	)
 
 endfunction(AddSharedToComponent)
@@ -143,10 +140,10 @@ INSTALL(FILES
 
 INSTALL(PROGRAMS
 	${CMAKE_SOURCE_DIR}/setup/Linux/install.sh
-	${CMAKE_SOURCE_DIR}/setup/Linux/deinstall.sh
-	${CMAKE_SOURCE_DIR}/setup/Linux/removeConfigs.sh
-	DESTINATION Sourcetrail/setup
-	)
+	${CMAKE_SOURCE_DIR}/setup/Linux/uninstall.sh
+	${CMAKE_SOURCE_DIR}/setup/Linux/deleteConfig.sh
+	DESTINATION Sourcetrail
+)
 
 INSTALL(PROGRAMS
 	${CMAKE_SOURCE_DIR}/setup/Linux/Sourcetrail.sh
@@ -199,4 +196,3 @@ SET(CPACK_STRIP_FILES "Sourcetrail/sourcetrail")
 SET(CPACK_PACKAGE_CONTACT "astallinger@coati.io")
 
 INCLUDE(CPack)
-

setup/Linux/README

@@ -1,36 +1,44 @@
+
 Sourcetrail
 ===========
 
 Usage
 -----
 
-run Sourcetrail.sh script to start the application.
+Run the Sourcetrail.sh script to start Sourcetrail.
+
 
 Install
 -------
 
-in the setup folder is a install script that will coati install to /opt/sourcetrail
-root permission are required to run this script
+Run install.sh to install Sourcetrail to /opt/sourcetrail
+It also creates a symlink named 'sourcetrail' in /usr/bin to launch Sourcetrail from the console.
+Root permission is required to run this script.
+
+Run uninstall.sh to uninstall Sourcetrail.
 
 
-Configfiles
------------
+Config Files
+------------
+
+Sourcetrail places config files at ~/.config/sourcetrail
+Run deleteConfig.sh to delete them. This resets Sourcetrail to the initial configuration.
 
-Coati places configfiles at ~/.config/sourcetrail
 
 Documentation
 -------------
 
-documentation is available at http://sourcetrail.com/documentation/
+Documentation is available at http://sourcetrail.com/documentation/
+
 
 Website
 -------
 
 http://www.sourcetrail.com/
 
-Reporting a bug
+
+Reporting a Bug
 ---------------
 
-To report a bug go to https://github.com/CoatiSoftware/SourcetrailBugTracker/issues
-or write a email to support@coati.io
-
+Report bugs at https://github.com/CoatiSoftware/SourcetrailBugTracker/issues
+or write an e-mail to support@coati.io

setup/Linux/Sourcetrail.sh

@@ -9,15 +9,6 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 SOURCETRAIL_PATH="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-#setup data folder
-#if [ ! -d "${HOME}/.config/sourcetrail" ]; then
-	## Control will enter here if $DIRECTORY doesn't exist.
-	#mkdir -p "${HOME}/.config/sourcetrail"
-	#echo "First start of Sourcetrail from this user, copy default configfiles to ~/.config/sourcetrail"
-#fi
-
-#cp -rn "$SOURCETRAIL_PATH/user"/* "${HOME}/.config/sourcetrail/"
-
 export LD_LIBRARY_PATH="$SOURCETRAIL_PATH/lib:$LD_LIBRARY_PATH"
 export QT_XKB_CONFIG_ROOT="/usr/share/X11/xkb:$QT_XKB_CONFIG_ROOT"
 export QT_QPA_PLATFORM_PLUGIN_PATH="$SOURCETRAIL_PATH/lib/platforms"

setup/Linux/coati

@@ -1 +0,0 @@
-/usr/local/share/coati/Coati.sh

setup/Linux/createIcons.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+
 SOURCE_DIR=$1
 BUILD_DIR=$2
 ICON=$SOURCE_DIR/bin/app/data/gui/icon/logo_1024_1024.png
@@ -19,4 +20,4 @@ createIcon 512x512
 createIcon 256x256
 createIcon 128x128
 createIcon 64x64
-createIcon 48x48
+createIcon 48x48

setup/Linux/deleteConfig.sh

@@ -1,10 +1,8 @@
+#!/bin/sh
 
-MY_PATH=`dirname "$0"`
-
-echo "Are you sure to delete your coait configs"
+echo "Are you sure want to delete your Sourcetrail config?"
 printf 'enter [y/n] '
 read ans
 case ${ans:=y} in [yY]*) ;; *) exit ;; esac
 
 rm -rf ~/.config/sourcetrail
-

setup/Linux/findAndCopyLibraries.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+
 mkdir -p setup/Linux/lib
 ldd bin/app/Release/Sourcetrail | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' setup/Linux/lib
 

setup/Linux/install.sh

@@ -1,20 +1,23 @@
-SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
-MY_PATH=$SCRIPT_DIR/..
+#!/bin/sh
 
-cat "${MY_PATH}/EULA.txt"
-echo "Agree to the EULA"
-printf 'enter [y/n] '
-read ans
-case ${ans:=y} in [yY]*) ;; *) exit ;; esac
+echo "Installing Sourcetrail in /opt/sourcetrail"
 
-echo "Run this script as root"
+if [ "$(id -u)" -ne 0 ]; then
+  echo >&2 "Error: Please run script as root or with sudo. Exiting..."
+  exit 1
+fi
+
+MY_PATH="$( cd "$( dirname "$0" )" && pwd )"
 
 cp -rf "$MY_PATH/" /opt/sourcetrail/ > /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
+
+ln -f -s /opt/sourcetrail/Sourcetrail.sh /usr/bin/sourcetrail
+
 update-mime-database /usr/share/mime > /dev/null
 update-desktop-database > /dev/null
 
-ln -f -s /opt/sourcetrail/Sourcetrail.sh /usr/bin/sourcetrail > /dev/null
-
+echo "Installation complete."
+echo "Enter 'sourcetrail' to launch application."

setup/Linux/sourcetrail.desktop

@@ -2,7 +2,7 @@
 Name=Sourcetrail
 GenericName=Sourcetrail
 X-GNOME-FullName=Sourcetrail
-Comment=Code Explorer
+Comment=Source Code Explorer
 Exec=/usr/bin/sourcetrail
 Icon=sourcetrail
 Terminal=true

setup/Linux/uninstall.sh

@@ -1,14 +1,16 @@
+#!/bin/sh
 
-MY_PATH=`dirname "$0"`
-MY_PATH=../$MY_PATH
+echo "Do you want to uninstall Sourcetrail?"
+
+if [ "$(id -u)" -ne 0 ]; then
+  echo >&2 "Error: Please run script as root or with sudo. Exiting..."
+  exit 1
+fi
 
-echo "Remove sourcetrail form system"
 printf 'enter [y/n] '
 read ans
 case ${ans:=y} in [yY]*) ;; *) exit ;; esac
 
-echo "Run this script as root"
-
 rm /usr/bin/sourcetrail
 rm /usr/share/mime/packages/sourcetrail-mime.xml
 rm /usr/share/applications/sourcetrail.desktop
@@ -18,3 +20,4 @@ rm /opt/sourcetrail -rf
 update-mime-database /usr/share/mime
 update-desktop-database
 
+echo "Deinstallation complete."

src/lib_gui/platform_includes/includesLinux.h

@@ -3,12 +3,13 @@
 
 #include <QCoreApplication>
 #include <QDir>
+
+#include "qt/utility/utilityQt.h"
 #include "utility/AppPath.h"
-#include "utility/UserPaths.h"
-#include "utility/ResourcePaths.h"
 #include "utility/file/FilePath.h"
 #include "utility/file/FileSystem.h"
-#include "qt/utility/utilityQt.h"
+#include "utility/ResourcePaths.h"
+#include "utility/UserPaths.h"
 
 void setupPlatform(int argc, char *argv[])
 {