rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 08:17:11 -07:00
Code Activity

Clear command line arguments on execution

Browse source
This commit is contained in:
Erik C. Thauvin 2024-08-02 18:26:00 -07:00
parent e2cc7a6782
commit b94b23af56
Signed by: erik
GPG key ID: 776702A6A2DA330E
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/rife/bld/operations/AbstractToolProviderOperation.java
View file

@ -85,18 +85,24 @@ public abstract class AbstractToolProviderOperation<T extends AbstractToolProvid
return (T) this; return (T) this;
} }
/**
* Runs an instance of the tool.
* <p>
* Command line arguments are automatically cleared.
*
* @throws Exception if an error occurred
*/
@Override @Override
public void execute() throws Exception { public void execute() throws Exception {
if (toolArgs_.isEmpty()) { if (toolArgs_.isEmpty()) {
System.err.println("No " + toolName_ + " arguments specified."); System.err.println("No " + toolName_ + " command line arguments specified.");
throw new ExitStatusException(ExitStatusException.EXIT_FAILURE); throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
} }
var tool = ToolProvider.findFirst(toolName_).orElseThrow(() ->
new IllegalStateException("No " + toolName_ + " tool found."));
var stderr = new StringWriter(); var stderr = new StringWriter();
var stdout = new StringWriter(); var stdout = new StringWriter();
try (var err = new PrintWriter(stderr); var out = new PrintWriter(stdout)) { try (var err = new PrintWriter(stderr); var out = new PrintWriter(stdout)) {
var tool = ToolProvider.findFirst(toolName_).orElseThrow(() ->
new IllegalStateException("No " + toolName_ + " tool found."));
var status = tool.run(out, err, toolArgs_.toArray(new String[0])); var status = tool.run(out, err, toolArgs_.toArray(new String[0]));
out.flush(); out.flush();
err.flush(); err.flush();
@ -115,6 +121,8 @@ public abstract class AbstractToolProviderOperation<T extends AbstractToolProvid
} }
ExitStatusException.throwOnFailure(status); ExitStatusException.throwOnFailure(status);
} finally {
toolArgs_.clear();
} }
} }