godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #108412 from wjt/push-qmklovyxnnom

Browse Source 
linux/bsd/mac: Use pkill to stop remote instance over SSH
This commit is contained in:
Thaddeus Crews
2025-10-23 11:03:57 -05:00
parent da593d0c16 3d322c3f36
commit 0caf8057a7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/linuxbsd/export/export_plugin.cpp
View File

@@ -192,7 +192,7 @@ void EditorExportPlatformLinuxBSD::get_export_options(List<ExportOption> *r_opti
"\"{temp_dir}/{exe_name}\" {cmd_args}"; "\"{temp_dir}/{exe_name}\" {cmd_args}";
String cleanup_script = "#!/usr/bin/env bash\n" String cleanup_script = "#!/usr/bin/env bash\n"
"kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")\n" "pkill -x -f \"{temp_dir}/{exe_name} {cmd_args}\"\n"
"rm -rf \"{temp_dir}\""; "rm -rf \"{temp_dir}\"";
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "ssh_remote_deploy/enabled"), false, true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "ssh_remote_deploy/enabled"), false, true));

2
platform/macos/export/export_plugin.cpp
View File

@@ -602,7 +602,7 @@ void EditorExportPlatformMacOS::get_export_options(List<ExportOption> *r_options
"open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}"; "open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}";
String cleanup_script = "#!/usr/bin/env bash\n" String cleanup_script = "#!/usr/bin/env bash\n"
"kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\")\n" "pkill -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\"\n"
"rm -rf \"{temp_dir}\""; "rm -rf \"{temp_dir}\"";
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "ssh_remote_deploy/enabled"), false, true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "ssh_remote_deploy/enabled"), false, true));