Updated flatpak build

Added startup script checking if to run X11 or wayland.

.gitignore

@@ -125,7 +125,7 @@ TAGS
 # generated packages
 *.zip
 *.exe
-*.sh
+#*.sh
 *.deb
 *.rpm
 *.dmg
@@ -133,7 +133,7 @@ TAGS
 *.tar.gz
 
 # packaging related files
-!packaging/scripts/prepare_deb_freerdp-nightly.sh
+!packaging/**.sh
 packaging/deb/freerdp-nightly/freerdp-nightly
 packaging/deb/freerdp-nightly/freerdp-nightly-dev
 packaging/deb/freerdp-nightly/freerdp-nightly-dbg

packaging/flatpak/com.freerdp.FreeRDP.json

@@ -7,7 +7,7 @@
         "cflags": "-O2 -g",
         "cxxflags": "-O2 -g"
     },
-    "command": "xfreerdp",
+    "command": "freerdp.sh",
     "cleanup": [
     ],
     "finish-args": [
@@ -69,6 +69,19 @@
             }
         ]
     },
+    {
+        "name": "wrapper",
+        "buildsystem": "simple",
+        "build-commands": [
+                "install -D freerdp.sh /app/bin/freerdp.sh"
+            ],
+        "sources": [
+                {
+                     "type": "file",
+                     "path": "freerdp.sh"
+                }
+            ]
+    },
     {
         "name": "freerdp",
         "buildsystem": "cmake-ninja",

packaging/flatpak/freerdp.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+if [ -z $XDG_SESSION_TYPE ];
+then
+	echo "XDG_SESSION_TYPE undefined"
+	exit -1
+elif [ "$XDG_SESSION_TYPE" = "wayland" ];
+then
+	echo "wayland $(which wlfreerdp)"
+	wlfreerdp $@
+elif [ "$XDG_SESSION_TYPE" = "x11" ];
+then
+	echo "X11 $(which xfreerdp)"
+	xfreerdp $@
+	exit $rc
+else
+	echo "XDG_SESSION_TYPE $XDG_SESSION_TYPE not handled"
+	exit -1
+fi