Merge pull request #265 from EduardKrieger/bugfix/executeCommand

Bugfix/execute command

Author: EduardKrieger

runners/console/index.ts

@@ -456,25 +456,30 @@ export class Console extends Runner {
     runExecuteCommand(runCommand: RunCommand): RunResult {
         let result = new RunResult();
         result.returnCode = 0; 
-        let commandIndex;
+        let commandIndex, process;
         if(runCommand.command.parameters[0] && runCommand.command.parameters[1]){
             commandIndex = this.platform == ConsolePlatform.LINUX ? 1 : 0;
         }
         else{
             throw new Error("You have to pass a command for Windows and Linux based OS");
         }
 
-        let exeCommand = (runCommand.command.parameters.length > 1 && runCommand.command.parameters[2].args)
+        let exeCommand = (runCommand.command.parameters.length > 2 && runCommand.command.parameters[2].args)
             ? runCommand.command.parameters[commandIndex]+ " " +runCommand.command.parameters[2].args.join(" ")
             : runCommand.command.parameters[commandIndex];
 
-        let dirPath = (runCommand.command.parameters.length > 1 && runCommand.command.parameters[2].dir)
+        let dirPath = (runCommand.command.parameters.length > 2 && runCommand.command.parameters[2].dir)
             ? path.join(this.getVariable(this.WORKSPACE_DIRECTORY), runCommand.command.parameters[2].dir)
             : this.getVariable(this.WORKSPACE_DIRECTORY)
 
         if(runCommand.command.parameters.length > 2 && runCommand.command.parameters[2].asynchronous){
             if(runCommand.command.parameters[3].port){
-                let process = ConsoleUtils.executeCommandAsync(exeCommand, dirPath, result,this.env);
+                if(exeCommand.substring(0,6).toLowerCase() == "devon "){
+                    process = ConsoleUtils.executeDevonCommandAsync(exeCommand.substring(6), dirPath, path.join(this.getWorkingDirectory(), "devonfw") ,result,this.env);
+                }else{
+                    process = ConsoleUtils.executeCommandAsync(exeCommand, dirPath, result,this.env);
+                }
+                
                 if(process.pid) {
                     this.asyncProcesses.push({ pid: process.pid, port: runCommand.command.parameters[3].port});
                 }
@@ -483,12 +488,17 @@ export class Console extends Runner {
                 throw new Error("Missing arguments for the command " + exeCommand + ". You have to specify a port for the server. For further information read the function documentation.");
             } 
         }
-        else ConsoleUtils.executeCommandSync(exeCommand, dirPath, result, this.env);
-        
+        else{
+            if(exeCommand.substring(0,6).toLowerCase() == "devon "){
+                ConsoleUtils.executeDevonCommandSync(exeCommand.substring(6), dirPath, path.join(this.getWorkingDirectory(), "devonfw") ,result,this.env);
+            }else{
+                ConsoleUtils.executeCommandSync(exeCommand, dirPath, result, this.env);
+            }
+        }
+            
       return result;
     }
 
-
     async assertExecuteCommand(runCommand: RunCommand, result: RunResult){
         try{
             let assert = new Assertions()