From 8a79b0bc73ada4d61138a47a8af1da0f0a2f51ab Mon Sep 17 00:00:00 2001 From: alexveley Date: Wed, 24 Jun 2026 02:15:18 -0400 Subject: [PATCH] Update pve RustDesk GA sync scripts --- blair-sync-rustdesk-via-ga.sh | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/blair-sync-rustdesk-via-ga.sh b/blair-sync-rustdesk-via-ga.sh index 809395f..e5163ef 100644 --- a/blair-sync-rustdesk-via-ga.sh +++ b/blair-sync-rustdesk-via-ga.sh @@ -222,25 +222,25 @@ def guest_file_read(vmid: int, guest_path: str) -> tuple[str | None, str | None] def read_rustdesk_id_cli(vmid: int) -> tuple[str | None, str | None]: - attempts = [ - ([RUSTDESK_EXE, '--get-id'], 'direct'), - (['cmd.exe', '/c', f'"{RUSTDESK_EXE} --get-id"'], 'cmd'), - ( - [ - 'powershell.exe', '-NoProfile', '-NonInteractive', '-Command', - "$ProgressPreference='SilentlyContinue'; & 'C:\\Program Files\\RustDesk\\rustdesk.exe' --get-id", - ], - 'powershell', - ), - ] - errors: list[str] = [] - for command, label in attempts: - rid, err = guest_exec_text(vmid, command, timeout=45) - if rid and re.fullmatch(r'\d{6,12}', rid): - log(f'VM {vmid}: ID {rid} from rustdesk --get-id ({label})') - return rid, None - errors.append(f'{label}: {err or "no id"}') - return None, errors[-1] if errors else 'rustdesk --get-id failed' + attempts = [ + ([RUSTDESK_EXE, '--get-id'], 'direct'), + (['cmd.exe', '/c', f'"{RUSTDESK_EXE} --get-id"'], 'cmd'), + ( + [ + 'powershell.exe', '-NoProfile', '-NonInteractive', '-Command', + "$ProgressPreference='SilentlyContinue'; & 'C:\\Program Files\\RustDesk\\rustdesk.exe' --get-id", + ], + 'powershell', + ), + ] + errors: list[str] = [] + for command, label in attempts: + rid, err = guest_exec_text(vmid, command, timeout=45) + if rid and re.fullmatch(r'\d{6,12}', rid): + log(f'VM {vmid}: ID {rid} from rustdesk --get-id ({label})') + return rid, None + errors.append(f'{label}: {err or "no id"}') + return None, errors[-1] if errors else 'rustdesk --get-id failed' def read_rustdesk_id_report(vmid: int) -> tuple[str | None, str | None]: