add work script

src/main/java/com/cloudam/cromwell/core/CreateJobRequest.java

@@ -64,14 +64,14 @@ public class CreateJobRequest extends CloudamRequest<CreateJobResponse> {
         // sbatch -n 1 -c 8 --comment disk:CLOUD_SSD:2700G:s-NV0tQ0PL run_local.sh
         // sbatch -n 1 -c 8 -p c-52-2 -q eco cpu.sh
         StringBuffer commandBuffer = new StringBuffer("#!/bin/sh\n");
-        BiConsumer<String, String> stringValidAppend = (key, agrs) -> {
+        BiConsumer<String, String> stringValidAppend = (key, args) -> {
             if (StringUtils.isNotBlank(key)) {
-                commandBuffer.append("#SBATCH ").append(agrs).append(" ").append(key).append("\n");
+                commandBuffer.append("#SBATCH ").append(args).append(" ").append(key).append("\n");
             }
         };
-        BiConsumer<Integer, String> intValidAppend = (key, agrs) -> {
+        BiConsumer<Integer, String> intValidAppend = (key, args) -> {
             if (key != null && key != 0) {
-                commandBuffer.append("#SBATCH ").append(agrs).append(" ").append(key).append("\n");
+                commandBuffer.append("#SBATCH ").append(args).append(" ").append(key).append("\n");
             }
         };
         stringValidAppend.accept(jobDescription.getName(), "-J");
@@ -82,11 +82,7 @@ public class CreateJobRequest extends CloudamRequest<CreateJobResponse> {
         intValidAppend.accept(jobDescription.getNtasks(), "-n");
         intValidAppend.accept(jobDescription.getTimeout(), "-t");
 
-        String workScript = jobDescription.getEnvs().get("cwd") + "/script";
-        if (Os.Windows != jobDescription.getAutoCluster().getOs()) {
-            commandBuffer.append("dos2unix ").append(workScript).append("\n");
-        }
-        commandBuffer.append("bash ").append(workScript).append("\n");
+        commandBuffer.append(jobDescription.getWorkScript()).append("\n");
         return commandBuffer.toString();
     }
 }

src/main/java/com/cloudam/cromwell/domain/JobDescription.java

@@ -29,6 +29,11 @@ public class JobDescription {
      */
     private AutoCluster autoCluster;
 
+    /**
+     *
+     */
+    private String workScript;
+
     /**
      * 环境变量
      */
@@ -86,6 +91,14 @@ public class JobDescription {
         this.autoCluster = autoCluster;
     }
 
+    public String getWorkScript() {
+        return workScript;
+    }
+
+    public void setWorkScript(String workScript) {
+        this.workScript = workScript;
+    }
+
     public Map<String, String> getEnvs() {
         return envs;
     }