The Unified and Autonomous Development Platform
Fix PowerShell command issue
Robin Shene40494d46314
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/command/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/command/CommandStep.javaindex f8557f1b51..922f0d99bd 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/command/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/command/CommandStep.java@@ -58,8 +58,7 @@ public class CommandStep extends Step {this.image = image;}- @Editable(order=110, description="Specify command interpreter. The default interpreter interpretes commands "- + "as batch script on Windows, and shell script on Linux/Unix")+ @Editable(order=110)@NotNullpublic Interpreter getInterpreter() {return interpreter;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/command/interpreter/DefaultInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/command/interpreter/DefaultInterpreter.javaindex 59844f4610..0d88b5efaa 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/command/interpreter/DefaultInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/command/interpreter/DefaultInterpreter.java@@ -9,12 +9,13 @@ import io.onedev.server.util.validation.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;-@Editable(order=100, name="Default")+@Editable(order=100, name="Default (Shell on Linux, Batch on Windows)")public class DefaultInterpreter extends Interpreter {private static final long serialVersionUID = 1L;- @Editable(order=110, description="Specify commands to execute under the <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>")+ @Editable(order=110, description="Specify shell commands (on Linux/Unix) or batch commands (on Windows) to execute "+ + "under the <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>")@Interpolative@Code(language=Code.SHELL, variableProvider="suggestVariables")@Size(min=1, message="may not be empty")diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.htmlindex cbcddbba8b..5960d535cf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.html@@ -5,7 +5,7 @@<div class="card-body"><a wicket:id="download" class="btn btn-light btn-hover-primary btn-block mb-4" title="Download log"><wicket:svg href="download" class="icon mr-2"/> Download</a><div wicket:id="warning" class="alert alert-notice alert-light-warning mb-4"></div>- <pre wicket:id="logContent"></pre>+ <pre class="font-size-sm" wicket:id="logContent"></pre></div></div></wicket:fragment>