Add more freedom on Mac with different version of Arduino #375
Conversation
|
@DeqingSun, It will cover your contributions to all Microsoft-managed open source projects. |
|
@DeqingSun, thanks for signing the contribution license agreement. We will now validate the agreement and then the pull request. |
src/arduino/arduinoSettings.ts
Outdated
| @@ -56,7 +56,11 @@ export class ArduinoSettings implements IArduinoSettings { | |||
|
|
|||
| public get defaultExamplePath(): string { | |||
| if (os.platform() === "darwin") { | |||
| return path.join(this._arduinoPath, "Arduino.app/Contents/Java/examples"); | |||
| if (this._arduinoPath.match(/Arduino.*\.app/)){ | |||
There was a problem hiding this comment.
5 Duplicate if logics.
Suggest to add a utility method resolveMacArduinoAppPath in src/common/util.ts. Then just need join "/Contents/xxx"
resolveMacArduinoAppPath(arduinoPath: string): string {
if (/Arduino.*\.app/.test(arduinoPath)) {
return arduinoPath;
} else {
return path.join(arduinoPath, "Arduino.app");
}
}
|
@DeqingSun Thanks for fixing the issue. Your PR doesn't pass tslint check. Please run "gulp tslint" in local PC first and fix the tslint issues. |
On Mac Arduino app has to be called "Arduino.app". In some cases (include me) we add a version number to keep a bunch of Arduino due to compatibility issues.
This PR add a regex check when generating a path. If it already specify a Arduino app, no "Arduino.app" is added.