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

Jump to bottom

Use shell script for launching tools #690

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Use shell script for launching tools #690

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2430366
Use shell script for launching tools
sciencewhiz Sep 14, 2024
2513594
Merge branch 'main' into tools_sh
sciencewhiz Sep 30, 2024
e4ff549
Fix extension
sciencewhiz Sep 30, 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
4 changes: 2 additions & 2 deletions vscode-wpilib/src/builtintools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class VbsToolRunner implements IToolRunner {
public async runTool(): Promise<boolean> {
const wp = await this.preferences.getFirstOrSelectedWorkspace();
return new Promise<boolean>((resolve, _reject) => {
let cmd = getIsWindows() ? `wscript.exe ${this.toolScript}` : `python3 ${this.toolScript}`;
let cmd = getIsWindows() ? `wscript.exe ${this.toolScript}` : `sh ${this.toolScript}`;

if (wp !== undefined) {
const toolStoreFolder = path.join(wp.uri.fsPath, `.${this.name}`);
Expand Down Expand Up @@ -67,7 +67,7 @@ export class BuiltinTools {
toolApi.addTool(new VbsToolRunner(toolPath, ht.name, api.getPreferencesAPI()));
}
} else {
const toolPath = path.join(homeTools.dir, ht.name + '.py');
const toolPath = path.join(homeTools.dir, ht.name + '.sh');
if (await existsAsync(toolPath)) {
// Tool exists, add it
toolApi.addTool(new VbsToolRunner(toolPath, ht.name, api.getPreferencesAPI()));
Expand Down