Skip to content

Commit a72f18c

Browse files
committed
using executeDevonCommand
1 parent f7303b0 commit a72f18c

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

runners/console/index.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -465,18 +465,18 @@ export class Console extends Runner {
465465
throw new Error("You have to pass a command for Windows and Linux based OS");
466466
}
467467

468-
let exeCommand = (runCommand.command.parameters.length > 1 && runCommand.command.parameters[2].args)
468+
let exeCommand = (runCommand.command.parameters.length > 2 && runCommand.command.parameters[2].args)
469469
? runCommand.command.parameters[commandIndex]+ " " +runCommand.command.parameters[2].args.join(" ")
470470
: runCommand.command.parameters[commandIndex];
471471

472-
let dirPath = (runCommand.command.parameters.length > 1 && runCommand.command.parameters[2].dir)
472+
let dirPath = (runCommand.command.parameters.length > 2 && runCommand.command.parameters[2].dir)
473473
? path.join(this.getVariable(this.workspaceDirectory), runCommand.command.parameters[2].dir)
474474
: this.getVariable(this.workspaceDirectory)
475475

476476
if(runCommand.command.parameters.length > 2 && runCommand.command.parameters[2].asynchronous){
477477
if(runCommand.command.parameters[3].port){
478-
if(exeCommand.substring(6).toLowerCase() == "devon "){
479-
process = ConsoleUtils.executeDevonCommandAsync(exeCommand, dirPath, path.join(this.getWorkingDirectory(), "devonfw") ,result,this.env);
478+
if(exeCommand.substring(0,6).toLowerCase() == "devon "){
479+
process = ConsoleUtils.executeDevonCommandAsync(exeCommand.substring(6), dirPath, path.join(this.getWorkingDirectory(), "devonfw") ,result,this.env);
480480
}else{
481481
process = ConsoleUtils.executeCommandAsync(exeCommand, dirPath, result,this.env);
482482
}
@@ -490,8 +490,8 @@ export class Console extends Runner {
490490
}
491491
}
492492
else{
493-
if(exeCommand.substring(6).toLowerCase() == "devon "){
494-
ConsoleUtils.executeDevonCommandSync(exeCommand, dirPath, path.join(this.getWorkingDirectory(), "devonfw") ,result,this.env);
493+
if(exeCommand.substring(0,6).toLowerCase() == "devon "){
494+
ConsoleUtils.executeDevonCommandSync(exeCommand.substring(6), dirPath, path.join(this.getWorkingDirectory(), "devonfw") ,result,this.env);
495495
}else{
496496
ConsoleUtils.executeCommandSync(exeCommand, dirPath, result, this.env);
497497
}
@@ -501,7 +501,6 @@ export class Console extends Runner {
501501
}
502502

503503
async assertExecuteCommand(runCommand: RunCommand, result: RunResult){
504-
console.log(RunResult);
505504
try{
506505
let assert = new Assertions()
507506
.noErrorCode(result)

0 commit comments

Comments
 (0)