diff --git a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy index cd9765e0..ae6d680e 100644 --- a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy +++ b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy @@ -40,7 +40,7 @@ interface IStepExecutor { def ringCommand(String script) - void start(String script, boolean returnStatus) + void start(String script) void tool(String toolName) diff --git a/src/ru/pulsar/jenkins/library/StepExecutor.groovy b/src/ru/pulsar/jenkins/library/StepExecutor.groovy index d5b9e269..d337aab6 100644 --- a/src/ru/pulsar/jenkins/library/StepExecutor.groovy +++ b/src/ru/pulsar/jenkins/library/StepExecutor.groovy @@ -73,8 +73,8 @@ class StepExecutor implements IStepExecutor { } @Override - void start(String script, boolean returnStatus = false) { - steps.start(script, returnStatus) + void start(String script) { + steps.start(script) } @Override diff --git a/src/ru/pulsar/jenkins/library/steps/Start.groovy b/src/ru/pulsar/jenkins/library/steps/Start.groovy index 6f62c86b..8d8c99e0 100644 --- a/src/ru/pulsar/jenkins/library/steps/Start.groovy +++ b/src/ru/pulsar/jenkins/library/steps/Start.groovy @@ -6,21 +6,19 @@ import ru.pulsar.jenkins.library.ioc.ContextRegistry class Start implements Serializable { private String script - private boolean returnStatus private String encoding = 'UTF-8' - Start(String script, boolean returnStatus = false) { + Start(String script) { this.script = script - this.returnStatus = returnStatus }; void run() { IStepExecutor steps = ContextRegistry.getContext().getStepExecutor() if (steps.isUnix()) { - steps.sh("$script &", returnStatus, encoding) + steps.sh("$script &", false, false , encoding) } else { - steps.bat("chcp 65001 > nul \nstart $script", returnStatus, encoding) + steps.bat("chcp 65001 > nul \nstart $script", false, false, encoding) } } } diff --git a/vars/start.groovy b/vars/start.groovy index 3e4acf01..2727ee1b 100644 --- a/vars/start.groovy +++ b/vars/start.groovy @@ -1,9 +1,9 @@ import ru.pulsar.jenkins.library.steps.Start import ru.pulsar.jenkins.library.ioc.ContextRegistry -void call(String script, boolean returnStatus = false) { +void call(String script) { ContextRegistry.registerDefaultContext(this) - Start start = new Start(script, returnStatus) + Start start = new Start(script) start.run() }