Add more freedom on Mac with different version of Arduino

Author: DeqingSun

src/arduino/arduinoSettings.ts

@@ -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/)){
+                return path.join(this._arduinoPath, "/Contents/Java/examples");
+            }else{
+                return path.join(this._arduinoPath, "Arduino.app/Contents/Java/examples");
+            }
         } else {
             return path.join(this._arduinoPath, "examples");
         }
@@ -68,15 +72,23 @@ export class ArduinoSettings implements IArduinoSettings {
 
     public get defaultPackagePath(): string {
         if (os.platform() === "darwin") {
-            return path.join(this._arduinoPath, "Arduino.app/Contents/Java/hardware");
+            if (this._arduinoPath.match(/Arduino.*\.app/)){
+                return path.join(this._arduinoPath, "/Contents/Java/hardware");
+            }else{
+                return path.join(this._arduinoPath, "Arduino.app/Contents/Java/hardware");
+            } 
         } else { // linux and win32.
             return path.join(this._arduinoPath, "hardware");
         }
     }
 
     public get defaultLibPath(): string {
         if (os.platform() === "darwin") {
-            return path.join(this._arduinoPath, "Arduino.app/Contents/Java/libraries");
+            if (this._arduinoPath.match(/Arduino.*\.app/)){
+                return path.join(this._arduinoPath, "/Contents/Java/libraries");
+            }else{
+                return path.join(this._arduinoPath, "Arduino.app/Contents/Java/libraries");
+            }
         } else { // linux and win32
             return path.join(this._arduinoPath, "libraries");
         }
@@ -85,7 +97,11 @@ export class ArduinoSettings implements IArduinoSettings {
     public get commandPath(): string {
         const platform = os.platform();
         if (platform === "darwin") {
-            return path.join(this._arduinoPath, path.normalize("Arduino.app/Contents/MacOS/Arduino"));
+            if (this._arduinoPath.match(/Arduino.*\.app/)){
+                return path.join(this._arduinoPath, path.normalize("/Contents/MacOS/Arduino"));
+            }else{
+                return path.join(this._arduinoPath, path.normalize("Arduino.app/Contents/MacOS/Arduino"));
+            }
         } else if (platform === "linux") {
             return path.join(this._arduinoPath, "arduino");
         } else if (platform === "win32") {

src/common/sys/darwin.ts

@@ -19,7 +19,11 @@ export function resolveArduinoPath(): string {
 }
 
 export function validateArduinoPath(arduinoPath: string): boolean {
-    return fileExistsSync(path.join(arduinoPath, "Arduino.app/Contents/MacOS/Arduino"));
+    if (arduinoPath.match(/Arduino.*\.app/)){
+        return fileExistsSync(path.join(arduinoPath, "/Contents/MacOS/Arduino"));
+    }else{
+        return fileExistsSync(path.join(arduinoPath, "Arduino.app/Contents/MacOS/Arduino"));
+    }
 }
 
 export function findFile(fileName: string, cwd: string): string {