Add RustDesk Client (software ID 13) to dietpi-software

.github/workflows/dietpi-software.bash

@@ -116,6 +116,7 @@ Process_Software()
 			10) aCOMMANDS[i]='amiberry-lite -h | grep '\''^\$VER: Amiberry-Lite '\';;
 			11) aCOMMANDS[i]='gzdoom -norun | grep '\''^GZDoom version '\';;
 			12) aSERVICES[i]='rustdesksignal rustdeskrelay' aTCP[i]='21115 21116 21117 21118 21119' aUDP[i]='21116';;
+			13) aCOMMANDS[i]='rustdesk --version';;
 			#16) aSERVICES[i]='microblog-pub' aTCP[i]='8007';; Service enters a CPU-intense internal error loop until it has been configured interactively via "microblog-pub configure", hence it is not enabled and started anymore after install but instead as part of "microblog-pub configure"
 			17) aCOMMANDS[i]='git -v';;
 			#22) QuiteRSS: has no CLI

.github/workflows/update_urls.bash

@@ -19,6 +19,13 @@ aARCH[$software_id]='armv7 arm64v8 amd64'
 aARCH_CHECK[$software_id]='riscv64'
 aREGEX[$software_id]='https://github.com/rustdesk/rustdesk-server/releases/download/.*/rustdesk-server-linux-\$arch\.zip'
 
+# RustDesk Client
+software_id=13
+aCHECK[$software_id]='curl -sSf '\''https://api.github.com/repos/rustdesk/rustdesk/releases/latest'\'' | mawk -F\" "/^ *\"browser_download_url\": \".*\/rustdesk-[^\"\/]*-$arch\.deb\"$/{print \$4}"'
+aARCH[$software_id]='armv7-sciter aarch64 x86_64'
+aARCH_CHECK[$software_id]='riscv64'
+aREGEX[$software_id]='https://github.com/rustdesk/rustdesk/releases/download/.*/rustdesk-.*-\$arch\.deb'
+
 # microblog.pub: Update Python version
 software_id=16
 aCHECK[$software_id]='curl -sSf '\''https://api.github.com/repos/pyenv/pyenv/contents/plugins/python-build/share/python-build?ref=master'\'' | mawk -F\" '\''/^ *"name": "3\.11\.[0-9]*",$/{print $4}'\'' | sort -Vr | head -1'

.meta/dietpi-survey_report

@@ -581,7 +581,7 @@ shopt -s extglob # +(expr) syntax
 	do
 		aSOFTWARE_NAME9_20[i]=${aSOFTWARE_NAME9_19[i]}
 	done
-	aSOFTWARE_NAME9_20[12]='RustDesk'
+	aSOFTWARE_NAME9_20[12]='RustDesk Server'
 
 	aSOFTWARE_NAME10_0=()
 	for i in "${!aSOFTWARE_NAME9_20[@]}"
@@ -606,6 +606,7 @@ shopt -s extglob # +(expr) syntax
 		aSOFTWARE_NAME10_2[i]=${aSOFTWARE_NAME10_1[i]}
 	done
 	aSOFTWARE_NAME10_2[215]='Immich'
+	aSOFTWARE_NAME10_2[13]='RustDesk Client'
 
 	# Pre-create software counter array so that we can see also software (available in newest version) with 0 installs
 	for i in "${aSOFTWARE_NAME10_2[@]}"

CHANGELOG.txt

@@ -4,7 +4,8 @@ v10.2
 New images:
 
 New software:
-- Immich | This high performance self-hosted photo and video management solution has been added to our software catalogue. Available on amd64 and arm64 only.
+- Immich | This high performance self-hosted photo and video management solution has been added to our software catalogue. Available on x86_64 and ARMv8 only.
+- RustDesk Client: Client software for the RustDesk desktop sharing platform. Fits perfect to our software package "RustDesk Server". An X11 desktop needs to be installed or will be installed during the RustDesk Client installation process.
 
 Enhancements:
 - DietPi-Benchmark | The benchmark script has been moved to /boot/dietpi/dietpi-benchmark and a shell alias has been added, so it can now be called directly from the console as "dietpi-benchmark" without having to browse through dietpi-config first.

README.md

@@ -347,10 +347,11 @@ Links to hardware and software manufacturers, sources and build instructions use
 - [PiJuice](https://github.com/PiSupply/PiJuice)
 - [LazyLibrarian](https://gitlab.com/LazyLibrarian/LazyLibrarian)
 - [BirdNET-Go](https://github.com/tphakala/birdnet-go)
-- [RustDesk](https://github.com/rustdesk/rustdesk-server)
+- [RustDesk Server](https://github.com/rustdesk/rustdesk-server)
 - [Uptime Kuma](https://github.com/louislam/uptime-kuma)
 - [WhoDB](https://github.com/clidey/whodb)
 - [Immich](https://github.com/immich-app/immich)
+- [RustDesk Client](https://github.com/rustdesk/rustdesk)
 
 ---
 

dietpi/dietpi-services

@@ -301,6 +301,7 @@ _EOF_
 				'nxserver'		# NoMachine
 				'rustdesksignal'
 				'rustdeskrelay'
+				'rustdesk'
 
 				# VPN: Servers as well as client shall not be DietPi-controlled. VPN servers may be used for remote maintenance sessions, VPN clients may be wanted/needed for anonymised Internet requests.
 				#'wg-quick@wg0'		# Currently instantiated services are not supported

dietpi/dietpi-software

@@ -312,6 +312,16 @@ Available commands:
 		# - RISC-V & ARMv6: https://github.com/rustdesk/rustdesk-server/releases
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,11]=0
+		#------------------
+		software_id=13
+		aSOFTWARE_NAME[$software_id]='RustDesk Client'
+		aSOFTWARE_DESC[$software_id]='open-source remote desktop client, written in Rust'
+		aSOFTWARE_CATX[$software_id]=1
+		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/remote_desktop/#rustdesk-client'
+		aSOFTWARE_DEPS[$software_id]='6'
+		# - RISC-V & ARMv6: https://github.com/rustdesk/rustdesk/releases
+		# - ARMv7 since packages depend on non-t64 libraries
+		(( $G_HW_ARCH == 3 || $G_HW_ARCH == 10 )) || aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,$G_HW_ARCH]=0
 
 		# Media Systems
 		#--------------------------------------------------------------------------------
@@ -12497,6 +12507,32 @@ _EOF_
 			unset -v rd_inst rd_data
 		fi
 
+		if To_Install 13 # RustDesk Client
+		then
+			case $G_HW_ARCH in
+				2) local arch='armv7-sciter';;
+				3) local arch='aarch64';;
+				*) local arch='x86_64';;
+			esac
+
+			# Workaround: https://github.com/rustdesk/rustdesk/pull/14429
+			local workaround=0
+			if [[ ! -f '/usr/bin/python3' ]]
+			then
+				G_DIETPI-NOTIFY 2 'Applying workaround for faulty Python check in package postinst'
+				G_EXEC eval 'echo -e '\''#!/bin/dash\necho Python 3.4.5'\'' > /usr/bin/python3'
+				G_EXEC chmod +x /usr/bin/python3
+				workaround=1
+			fi
+
+			local fallback_url="https://github.com/rustdesk/rustdesk/releases/download/1.4.5/rustdesk-1.4.5-$arch.deb"
+			Download_Install "$(curl -sSfL 'https://api.github.com/repos/rustdesk/rustdesk/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/rustdesk-[^\"\/]*-$arch\.deb\"$/{print \$4}")"
+
+			# Revert workaround
+			(( $workaround )) && G_EXEC rm /usr/bin/python3
+			unset -v arch workaround
+		fi
+
 		if To_Install 176 uptime-kuma # Uptime Kuma: https://github.com/louislam/uptime-kuma/wiki/🔧-How-to-Install#-non-docker
 		then
 			local opt='/opt/uptime-kuma' mnt='/mnt/dietpi_userdata/uptime-kuma'
@@ -14670,6 +14706,11 @@ _EOF_
 			G_EXEC rm -Rf /mnt/dietpi_userdata/rustdesk
 		fi
 
+		if To_Uninstall 13 # RustDesk Client
+		then
+			G_AGP rustdesk
+		fi
+
 		if To_Uninstall 176 # Uptime Kuma
 		then
 			Remove_Service uptime-kuma 1 1