Skip to content

Commit

Permalink
Merge pull request #30 from TheRoddyWMS/revert-public-resultLines-for…
Browse files Browse the repository at this point in the history
…-BatchEuphoria

Reverted ExecutionResult.resultLines to public to keep BatchEuphoria binary dependencies intact.
  • Loading branch information
vinjana committed Oct 21, 2020
2 parents b701cd7 + 5d0e622 commit fff4594
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ public class ExecutionResult extends InfoObject {
protected final boolean successful;
/**
* All result lines.
* TODO: Make protected. This is public to avoid having to also update BatchEuphoria, which references the field.
*/
protected final List<String> resultLines;
public final List<String> resultLines;
/**
* First line of the result array.
* Null if no entries are in the array.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class LocalExecutionHelper {
* @return
*/
static ExecutionResult executeCommandWithExtendedResult(String command, OutputStream outputStream = null) {
//Process process = Roddy.getLocalCommandSet().getShellExecuteCommand(command).execute();
Process process = ["bash", "-c", command].execute();

// TODO Put to a custom class which can handle things for Windows as well.
Expand All @@ -82,6 +81,7 @@ class LocalExecutionHelper {
logger.postRareInfo("Executing the command ${command} locally.")

// TODO This should not return the stderr and stdout intermingled (in contrast to SSHExecutionService).
// WARNING: There are no guarantees that stderr is written after stderr or otherwise. Output may be unpredictable!
if (outputStream)
process.waitForProcessOutput(outputStream, outputStream)
else {
Expand Down

0 comments on commit fff4594

Please sign in to comment.