Merge remote-tracking branch

'origin/GP-5015_d-millar_spaces_fix--SQUASHED' into patch (Closes #6999)
This commit is contained in:
Ryan Kurtz 2024-10-22 13:47:05 -04:00
commit 968a57a7ce

View File

@ -132,31 +132,25 @@ public class ShellUtils {
if (args.isEmpty()) {
return "";
}
StringBuilder line = new StringBuilder(args.get(0));
StringBuilder line = new StringBuilder(genreateArgument(args.get(0)));
for (int i = 1; i < args.size(); i++) {
String a = args.get(i);
line.append(" " + genreateArgument(a));
}
return line.toString();
}
public static String genreateArgument(String a) {
if (a.contains(" ")) {
if (a.contains("\"")) {
if (a.contains("'")) {
line.append(" \"");
line.append(a.replace("\"", "\\\""));
line.append("\"");
continue;
return "\"" + a.replace("\"", "\\\"") + "\"";
}
line.append(" '");
line.append(a);
line.append("'");
continue;
return "'" + a + "'";
}
line.append(" \"");
line.append(a);
line.append("\"");
continue;
return "\"" + a + "\"";
}
line.append(" ");
line.append(a);
}
return line.toString();
return a;
}
public static String generateEnvBlock(Map<String, String> env) {