Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added fix for the start action for command using mvn/gradle #398

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Added fix for the start action for command using mvn/gradle #398

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb35940
Added fix for the start action for command using mvn/gradle
SuparnaSuresh Nov 27, 2024
776c3c5
maven executable path command updated
SuparnaSuresh Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/util/commandUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export async function getCommandForMaven(pomPath: string, command: string, termi
// attempt to use the Maven executable path, if empty try using mvn or mvnw according to the preferMavenWrapper setting
const mavenExecutablePath: string | undefined = vscode.workspace.getConfiguration("maven").get<string>("executable.path");
if (mavenExecutablePath) {
return formDefaultCommand(mavenExecutablePath, pomPath, command, "-f ", customCommand);
return formDefaultCommandWithPath(mavenExecutablePath, pomPath, command, "-f ", customCommand);
}
let mvnCmdStart = await mvnCmd(pomPath);
if (mvnCmdStart === "mvn") {
Expand Down Expand Up @@ -161,7 +161,7 @@ function getGradleCommandForWin(gradleCmdStart: string, buildGradlePath: string,
switch (terminalType) {
case ShellType.GIT_BASH:
gradleCmdStart = Path.join(gradleCmdStart, "gradlew");
return formDefaultCommand(gradleCmdStart, buildGradlePath, command, "-b=", customCommand); //Bash
return formDefaultCommandWithPath(gradleCmdStart, buildGradlePath, command, "-b=", customCommand); //Bash
case ShellType.POWERSHELL:
gradleCmdStart = Path.join(gradleCmdStart, "gradlew.bat");
return formPowershellCommand(gradleCmdStart, buildGradlePath, command, "-b=", customCommand);
Expand All @@ -170,7 +170,7 @@ function getGradleCommandForWin(gradleCmdStart: string, buildGradlePath: string,
default:
// The default case is ShellType CMD or OTHERS
gradleCmdStart = Path.join(gradleCmdStart, "gradlew.bat");
return formDefaultCommand(gradleCmdStart, buildGradlePath, command, "-b=", customCommand);
return formDefaultCommandWithPath(gradleCmdStart, buildGradlePath, command, "-b=", customCommand);
}
}

Expand All @@ -190,7 +190,7 @@ function getMavenCommandForWin(mvnCmdStart: string, pomPath: string, command: st
default:
// The default case is ShellType CMD or OTHERS
mvnCmdStart = Path.join(mvnCmdStart, "mvnw.cmd");
return formDefaultCommand(mvnCmdStart, pomPath, command, "-f ", customCommand);
return formDefaultCommandWithPath(mvnCmdStart, pomPath, command, "-f ", customCommand);
}
}

Expand Down Expand Up @@ -218,6 +218,16 @@ function formLinuxBasedCommand(cmdStart: string, command: string, wrapperType: S
* Returns default command
*/
function formDefaultCommand(projectPath: string, buildFilePath: String, command: string, cmdOption: String, customCommand?: string): string {
if (customCommand) {
return `${projectPath} ` + `${command}` + ` ${customCommand}` + ` ${cmdOption}"${buildFilePath}"`;
}
return `${projectPath} ` + `${command}` + ` ${cmdOption}"${buildFilePath}"`;
}

/**
* Returns default format for the command with Path
*/
function formDefaultCommandWithPath(projectPath: string, buildFilePath: String, command: string, cmdOption: String, customCommand?: string): string {
if (customCommand) {
return "\"" + projectPath + "\" " + `${command}` + ` ${customCommand}` + ` ${cmdOption}"${buildFilePath}"`;
}
Expand Down
Loading