increase integration into Freedesktop.org compliant systems

README.md

@@ -118,10 +118,10 @@ You can start the application through
 - a Windows launcher ('JFileSync3.exe')
 - a batch file ('bin/JFileSync3.bat')
 - a Unix shell script ('bin/JFileSync3')
-- a XDG launcher script ('bin/JFileSync3.desktop')
+- a XDG launcher script ('share/applications/io.github.mgoellnitz.JFileSync3.desktop')
 
 The XDG launcher script can be automatically modified to reflect the current
-path with the script `prepare_xdg_file.sh`.
+path with the script `share/prepare_xdg_file.sh`.
 
 Nearly all functions of JFileSync3 can be controlled via the Graphical User
 Interface (GUI). However, JFileSync3 provides full access to all features

build.gradle

@@ -140,7 +140,7 @@ if (l4j) {
 startScripts {
   doLast {
     // Add some more reasonable memory settings to JFileSync3
-    unixScript.text = unixScript.text.replace('DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-splash:$APP_HOME/bin/JFileSync3-640x350-splash.png -ms1280m -mx1536m -Xms1280m -Xmx1536m"')
+    unixScript.text = unixScript.text.replace('DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-splash:$APP_HOME/share/icons/hicolor/scalable/actions/JFileSync3-640x350-splash.png -ms1280m -mx1536m -Xms1280m -Xmx1536m"')
     windowsScript.text = windowsScript.text.replace('DEFAULT_JVM_OPTS=', 'DEFAULT_JVM_OPTS=-ms1280m -mx1536m -Xms1280m -Xmx1536m')
     // Armor start script to use javaw and start when not used as a command line tool
     windowsScript.text = windowsScript.text.replace('java.exe', '%JAVA_CMD%')
@@ -154,13 +154,11 @@ ospackage {
   version = '3.0-SNAPSHOT'
   maintainer = 'Martin Goellnitz'
   url = 'https://mgoellnitz.github.io/JFileSync3'
-  into("/usr/share/applications") {
+  into("/usr/share") {
     from 'xdg'
-    include '*.desktop'
-  }
-  into("/usr/share/icons/hicolor/64x64") {
-    from 'xdg'
-    include '*.png'
+    include '**/*.desktop'
+    include '**/*.png'
+    include '**/*.xml'
   }
   into("/usr/share/$project.name") {
     from '.'
@@ -215,10 +213,11 @@ distZip {
     include '*.bmp'
   }
   // For the FreeDesktop.org desktop integration this looks better
-  into("$project.name/bin") {
+  into("$project.name/share") {
     from 'xdg'
-    include '*.desktop'
-    include '*.png'
+    include '**/*.desktop'
+    include '**/*.png'
+    include '**/*.xml'
     include 'prepare*.sh'
   }
   // legal stuff, examples, and documentation

xdg/JFileSync3.desktop → xdg/applications/io.github.mgoellnitz.JFileSync3.desktop

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=JFileSync3 - 3.0-SNAPSHOT
 Comment=Syncing and Encryption
 Exec=JFileSync3
-Icon=JFileSync3.png
+Icon=io.github.mgoellnitz.JFileSync3
 Categories=Application;Java
 Version=1.0
 Type=Application

xdg/metainfo/io.github.mgoellnitz.JFileSync3.metainfo.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>io.github.mgoellnitz.JFileSync3</id>
+  <project_license>GPL-3.0-or-later</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>JFileSync3</name>
+  <summary>Java based encrypting File Syncing Tool</summary>
+  <launchable type="desktop-id">io.github.mgoellnitz.JFileSync3.desktop</launchable>
+  <content_rating type="oars-1.1"/>
+  <developer_name>Martin Göllnitz</developer_name>
+  <developer id="io.github.mgoellnitz">
+    <name>Martin Göllnitz</name>
+  </developer>
+
+  <categories>
+    <category>Java</category>
+    <category>Archiving</category>
+    <category>Utility</category>
+  </categories>
+
+  <url type="homepage">https://mgoellnitz.github.io/JFileSync3/</url>
+  <url type="bugtracker">https://github.com/mgoellnitz/JFileSync3/issues</url>
+  <url type="donation">https://ko-fi.com/backendzeit</url>
+  <url type="vcs-browser">https://github.com/mgoellnitz/JFileSync3</url>
+
+  <description>
+    <p>
+      File syncing with optional compression and encryption for local and 
+      WebDAV folders. For local folders, encryption can optionally be 
+      accomplished with EncFS and thus be compatible with encfs4win, EDS Lite, 
+      Encdroid and so on.
+    </p>
+  </description>
+
+  <releases>
+    <release version="3.0.17" date="2022-09-25"/>
+    <release version="3.0.16" date="2021-11-24"/>
+    <release version="3.0.15" date="2018-03-27"/>
+    <release version="3.0.14" date="2016-12-29"/>
+    <release version="3.0.13" date="2015-10-11"/>
+    <release version="3.0.12" date="2015-10-06"/>
+    <release version="3.0.11" date="2015-09-27"/>
+    <release version="3.0.10" date="2015-08-17"/>
+    <release version="3.0.9" date="2015-07-12"/>
+  </releases>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/mgoellnitz/JFileSync3/master/screenshots/screenshot-sync-local.png</image>
+    </screenshot>
+  </screenshots>
+
+  <provides>
+    <binary>JFileSync3</binary>
+  </provides>
+
+  <supports>
+    <control>touch</control>
+  </supports>
+  <recommends>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <display_length compare="ge" side="shortest">600</display_length>
+    <display_length compare="ge" side="longest">720</display_length>
+  </recommends>
+  <requires>
+    <display_length compare="ge" side="longest">500</display_length>
+  </requires>
+</component>

xdg/prepare_desktop_file.sh

@@ -1,8 +1,9 @@
 #!/bin/sh
-DIR=$(dirname $(readlink -f $0))
+DIR=$(dirname $(dirname $(readlink -f $0)))
 if [ -f $DIR/../lib/JFileSync3.jar ] ; then
-  if [ -f ~/.config/user-dirs.dirs ] ; then
-    DESKTOP_DIR=~/$(cat ~/.config/user-dirs.dirs |grep XDG_DESKTOP_DIR|sed -e 's/^.*HOME.\(.*\)./\1/g')
+  USER_DIRS="${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs"
+  if [ -f ${USER_DIRS} ] ; then
+    DESKTOP_DIR=~/$(cat ${USER_DIRS} |grep XDG_DESKTOP_DIR|sed -e 's/^.*HOME.\(.*\)./\1/g')
   else
     if [ -f ~/.config/user-dirs.dirs ] ; then
       DESKTOP_DIR=~/$(cat /etc/xdg/user-dirs.defaults |grep DESKTOP|sed -e 's/^.*=\(.*\)$/\1/g')
@@ -11,7 +12,7 @@ if [ -f $DIR/../lib/JFileSync3.jar ] ; then
     fi
   fi
   PATTERN=$(echo $DIR|sed -e 's/\//\\\//g')\\/
-  sed -i.bak -e "s/^Exec=.*/Exec=${PATTERN}JFileSync3/" $DIR/JFileSync3.desktop
-  sed -i.bak -e "s/^Icon=.*/Icon=${PATTERN}JFileSync3.png/" $DIR/JFileSync3.desktop
+  sed -i.bak -e "s/^Exec=.*/Exec=${PATTERN}\\/bin\\/JFileSync3/" $DIR/share/applications/io.github.mgoellnitz.JFileSync3.desktop
+  sed -i.bak -e "s/^Icon=.*/Icon=${PATTERN}\\/share\\/icons\\/hicolor\\/64x64\\/apps\\/io.github.mgoellnitz.JFileSync3.png/" $DIR/share/applications/io.github.mgoellnitz.JFileSync3.desktop
   rm $DIR/JFileSync3.desktop.bak
 fi