From cc7fe4efdca7b2ac38a0f40f45e852c04eb70edc Mon Sep 17 00:00:00 2001 From: fufesou Date: Thu, 11 Jun 2026 23:09:34 +0800 Subject: [PATCH] Fix/generate py target injection (#15248) * fix: generate.py, target injection Signed-off-by: fufesou * refact: logs Signed-off-by: fufesou * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Update port_forward.rs --------- Signed-off-by: fufesou Co-authored-by: RustDesk <71636191+rustdesk@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- libs/portable/generate.py | 15 ++++++++++----- src/port_forward.rs | 1 - 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/portable/generate.py b/libs/portable/generate.py index 45c840789..d5468a5dc 100755 --- a/libs/portable/generate.py +++ b/libs/portable/generate.py @@ -2,6 +2,7 @@ import os import optparse +import subprocess from hashlib import md5 import brotli import datetime @@ -65,11 +66,15 @@ def write_app_metadata(output_folder: str): print(f"App metadata has been written to {output_path}") def build_portable(output_folder: str, target: str): - os.chdir(output_folder) - if target: - os.system("cargo build --locked --release --target " + target) - else: - os.system("cargo build --locked --release") + current_dir = os.getcwd() + try: + os.chdir(output_folder) + cmd = ["cargo", "build", "--locked", "--release"] + if target: + cmd.extend(["--target", target]) + subprocess.run(cmd, check=True) + finally: + os.chdir(current_dir) # Linux: python3 generate.py -f ../rustdesk-portable-packer/test -o . -e ./test/main.py # Windows: python3 .\generate.py -f ..\rustdesk\flutter\build\windows\runner\Debug\ -o . -e ..\rustdesk\flutter\build\windows\runner\Debug\rustdesk.exe diff --git a/src/port_forward.rs b/src/port_forward.rs index 61d6bfd71..9c0130951 100644 --- a/src/port_forward.rs +++ b/src/port_forward.rs @@ -30,7 +30,6 @@ fn run_rdp(port: u16) { if !password.is_empty() { args.push(format!("/pass:{}", password)); } - println!("{:?}", args); std::process::Command::new("cmdkey") .args(&args) .output()