Merge pull request #375 from DeqingSun/edit_Mac_Path

Add more freedom on Mac with different version of Arduino
microsoft · Jul 19, 2017 · 405d5bd · 405d5bd
2 parents b5f1c2e + 0c977e4
commit 405d5bd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/arduino/arduinoSettings.ts b/src/arduino/arduinoSettings.ts
@@ -56,7 +56,7 @@ export class ArduinoSettings implements IArduinoSettings {
 
     public get defaultExamplePath(): string {
         if (os.platform() === "darwin") {
-            return path.join(this._arduinoPath, "Arduino.app/Contents/Java/examples");
+            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath), "/Contents/Java/examples");
         } else {
             return path.join(this._arduinoPath, "examples");
         }
@@ -68,15 +68,15 @@ export class ArduinoSettings implements IArduinoSettings {
 
     public get defaultPackagePath(): string {
         if (os.platform() === "darwin") {
-            return path.join(this._arduinoPath, "Arduino.app/Contents/Java/hardware");
+            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath), "/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");
+            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath), "/Contents/Java/libraries");
         } else { // linux and win32
             return path.join(this._arduinoPath, "libraries");
         }
@@ -85,7 +85,7 @@ 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"));
+            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath), path.normalize("/Contents/MacOS/Arduino"));
         } else if (platform === "linux") {
             return path.join(this._arduinoPath, "arduino");
         } else if (platform === "win32") {

diff --git a/src/common/sys/darwin.ts b/src/common/sys/darwin.ts
@@ -3,7 +3,7 @@
 
 import * as childProcess from "child_process";
 import * as path from "path";
-import { directoryExistsSync, fileExistsSync } from "../util";
+import { directoryExistsSync, fileExistsSync, resolveMacArduinoAppPath } from "../util";
 
 export function resolveArduinoPath(): string {
     let result;
@@ -19,7 +19,7 @@ export function resolveArduinoPath(): string {
 }
 
 export function validateArduinoPath(arduinoPath: string): boolean {
-    return fileExistsSync(path.join(arduinoPath, "Arduino.app/Contents/MacOS/Arduino"));
+    return fileExistsSync(path.join(resolveMacArduinoAppPath(arduinoPath), "/Contents/MacOS/Arduino"));
 }
 
 export function findFile(fileName: string, cwd: string): string {

diff --git a/src/common/util.ts b/src/common/util.ts
@@ -388,3 +388,16 @@ export function getRegistryValues(hive: string, key: string, name: string): Prom
 export function convertToHex(number, width = 0) {
     return padStart(number.toString(16), width, "0");
 }
+
+/**
+ * This will accept any Arduino*.app on Mac OS,
+ * in case you named Arduino with a version number
+ * @argument {string} arduinoPath
+ */
+export function resolveMacArduinoAppPath(arduinoPath: string): string {
+    if (/Arduino.*\.app/.test(arduinoPath)) {
+        return arduinoPath;
+    } else {
+        return path.join(arduinoPath, "Arduino.app");
+    }
+}