Skip to content

Commit 0caf805

Browse files
committed
Merge pull request godotengine#108412 from wjt/push-qmklovyxnnom
linux/bsd/mac: Use pkill to stop remote instance over SSH
2 parents da593d0 + 3d322c3 commit 0caf805

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

platform/linuxbsd/export/export_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void EditorExportPlatformLinuxBSD::get_export_options(List<ExportOption> *r_opti
192192
"\"{temp_dir}/{exe_name}\" {cmd_args}";
193193

194194
String cleanup_script = "#!/usr/bin/env bash\n"
195-
"kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")\n"
195+
"pkill -x -f \"{temp_dir}/{exe_name} {cmd_args}\"\n"
196196
"rm -rf \"{temp_dir}\"";
197197

198198
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "ssh_remote_deploy/enabled"), false, true));

platform/macos/export/export_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ void EditorExportPlatformMacOS::get_export_options(List<ExportOption> *r_options
602602
"open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}";
603603

604604
String cleanup_script = "#!/usr/bin/env bash\n"
605-
"kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\")\n"
605+
"pkill -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\"\n"
606606
"rm -rf \"{temp_dir}\"";
607607

608608
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "ssh_remote_deploy/enabled"), false, true));

0 commit comments

Comments
 (0)