From 0dce270a9e2a6089470c6ea03a56b4a58affa0f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= <dkmaster@dkmon.com>
Date: Thu, 10 Jun 2021 17:25:23 +0200
Subject: [PATCH] Created portable udsclient using appimage. Now also for
 raspberry pi

---
 client-py3/full/linux/Makefile                     | 14 +++++++++-----
 client-py3/full/linux/build-packages.sh            |  6 ++++--
 .../full/linux/installer-appimage-template.sh      |  2 +-
 ...age.recipe => udsclient-appimage-x86_64.recipe} |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)
 rename client-py3/full/linux/{udsclient-appimage.recipe => udsclient-appimage-x86_64.recipe} (98%)

diff --git a/client-py3/full/linux/Makefile b/client-py3/full/linux/Makefile
index 7a7f3053..236a8bac 100644
--- a/client-py3/full/linux/Makefile
+++ b/client-py3/full/linux/Makefile
@@ -52,16 +52,20 @@ uninstall:
 	#  rm -rf $(CFGDIR)
 
 build-appimage:
-	cat udsclient-appimage.recipe | sed -e s/"version: 0.0.0"/"version: $(VERSION)"/g > appimage.recipe
+ifeq ($(DISTRO),x86_64)
+	cat udsclient-appimage-x86_64.recipe | sed -e s/"version: 0.0.0"/"version: $(VERSION)"/g > appimage.recipe
+else
+	cat udsclient-appimage-x86_64.recipe | sed -e s/"version: 0.0.0"/"version: $(VERSION)"/g | sed -e s/amd64\\\|x86_64/armhf/g > appimage.recipe
+endif
+
 	appimage-builder --recipe appimage.recipe
 # Now create dist and move appimage
 	rm -rf $(DESTDIR)
 	mkdir -p $(DESTDIR)
-	cp UDSClient-$(VERSION)-x86_64.AppImage $(DESTDIR)
+	cp UDSClient-$(VERSION)-$(DISTRO).AppImage $(DESTDIR)
 # Generate the .desktop fixed for new path
-	cat desktop/UDSClient.desktop | sed -e s/".usr.lib.UDSClient.UDSClient.py"/"\/usr\/bin\/UDSClient-$(VERSION)-x86_64.AppImage"/g > $(DESTDIR)/UDSClient.desktop
+	cat desktop/UDSClient.desktop | sed -e s/".usr.lib.UDSClient.UDSClient.py"/"\/usr\/bin\/UDSClient-$(VERSION)-$(DISTRO).AppImage"/g > $(DESTDIR)/UDSClient.desktop
 # And also, generater installer
 	cat installer-appimage-template.sh | sed -e s/"0.0.0"/"$(VERSION)"/g > $(DESTDIR)/installer.sh
 	chmod 755 $(DESTDIR)/installer.sh
-	tar czvf ../udsclient3-portable-$(VERSION).tar.gz -C $(DESTDIR) .
-# Now
+	tar czvf ../udsclient3-$(DISTRO)-$(VERSION).tar.gz -C $(DESTDIR) .
diff --git a/client-py3/full/linux/build-packages.sh b/client-py3/full/linux/build-packages.sh
index 779f337a..c9389a36 100755
--- a/client-py3/full/linux/build-packages.sh
+++ b/client-py3/full/linux/build-packages.sh
@@ -38,7 +38,9 @@ done
 # Make .tar.gz with source
 make DESTDIR=targz DISTRO=targz VERSION=${VERSION} install
 
-# And make portable .tar.gz
-make DESTDIR=appimage DISTRO=appimage VERSION=${VERSION} build-appimage
+# And make FULL CLIENT .tar.gz for x86 and raspberry
+make DESTDIR=appimage DISTRO=x86_64 VERSION=${VERSION} build-appimage-x86_64
+make DESTDIR=appimage DISTRO=armhf VERSION=${VERSION} build-appimage-x86_64
+
 
 rpm --addsign ../*rpm
diff --git a/client-py3/full/linux/installer-appimage-template.sh b/client-py3/full/linux/installer-appimage-template.sh
index 2ca9cf5b..da0ac643 100644
--- a/client-py3/full/linux/installer-appimage-template.sh
+++ b/client-py3/full/linux/installer-appimage-template.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "Installing UDSClient portable..."
+echo "Installing UDSClient..."
 
 cp UDSClient-0.0.0-x86_64.AppImage /usr/bin
 cp UDSClient.desktop /usr/share/applications
diff --git a/client-py3/full/linux/udsclient-appimage.recipe b/client-py3/full/linux/udsclient-appimage-x86_64.recipe
similarity index 98%
rename from client-py3/full/linux/udsclient-appimage.recipe
rename to client-py3/full/linux/udsclient-appimage-x86_64.recipe
index 1367345f..dbe73310 100644
--- a/client-py3/full/linux/udsclient-appimage.recipe
+++ b/client-py3/full/linux/udsclient-appimage-x86_64.recipe
@@ -39,6 +39,7 @@ AppDir:
       - python3-paramiko
       - python3-cryptography
       - freerdp2-x11
+      - x2goclient
     exclude: []
 
   runtime: