Skip to content

Commit 625fd8a

Browse files
committed
executeCommand uses executeDevonCommand
1 parent 6f3f59f commit 625fd8a

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

runners/console/index.ts

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ export class Console extends Runner {
457457
runExecuteCommand(runCommand: RunCommand): RunResult {
458458
let result = new RunResult();
459459
result.returnCode = 0;
460-
let commandIndex;
460+
let commandIndex, process;
461461
if(runCommand.command.parameters[0] && runCommand.command.parameters[1]){
462462
commandIndex = this.platform == ConsolePlatform.LINUX ? 1 : 0;
463463
}
@@ -475,7 +475,12 @@ export class Console extends Runner {
475475

476476
if(runCommand.command.parameters.length > 2 && runCommand.command.parameters[2].asynchronous){
477477
if(runCommand.command.parameters[3].port){
478-
let process = ConsoleUtils.executeCommandAsync(exeCommand, dirPath, result,this.env);
478+
if(exeCommand.substring(6).toLowerCase() == "devon "){
479+
process = ConsoleUtils.executeDevonCommandAsync(exeCommand, dirPath, path.join(this.getWorkingDirectory(), "devonfw") ,result,this.env);
480+
}else{
481+
process = ConsoleUtils.executeCommandAsync(exeCommand, dirPath, result,this.env);
482+
}
483+
479484
if(process.pid) {
480485
this.asyncProcesses.push({ pid: process.pid, port: runCommand.command.parameters[3].port});
481486
}
@@ -484,12 +489,17 @@ export class Console extends Runner {
484489
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.");
485490
}
486491
}
487-
else ConsoleUtils.executeCommandSync(exeCommand, dirPath, result, this.env);
488-
492+
else{
493+
if(exeCommand.substring(6).toLowerCase() == "devon "){
494+
ConsoleUtils.executeDevonCommandSync(exeCommand, dirPath, path.join(this.getWorkingDirectory(), "devonfw") ,result,this.env);
495+
}else{
496+
ConsoleUtils.executeCommandSync(exeCommand, dirPath, result, this.env);
497+
}
498+
}
499+
489500
return result;
490501
}
491502

492-
493503
async assertExecuteCommand(runCommand: RunCommand, result: RunResult){
494504
try{
495505
let assert = new Assertions()

0 commit comments

Comments
 (0)