ESP8266FS tool: update mkspiffs path for boards manager package insta…

…llation
esp8266 · Sep 9, 2015 · 545c8c2 · 545c8c2
1 parent 8427b5c
commit 545c8c2
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/ESP8266FS.java b/src/ESP8266FS.java
@@ -145,14 +145,20 @@ private void createAndUpload(){
             return;
         }
     }
-
-    File tool;
-    if(!PreferencesData.get("runtime.os").contentEquals("windows")) tool = new File(platform.getFolder()+"/tools", "mkspiffs");
-    else tool = new File(platform.getFolder()+"/tools", "mkspiffs.exe");
-    if(!tool.exists()){
-      System.err.println();
-      editor.statusError("SPIFFS Error: mkspiffs not found!");
-      return;
+    String mkspiffsCmd;
+    if(PreferencesData.get("runtime.os").contentEquals("windows"))
+        mkspiffsCmd = "mkspiffs.exe";
+    else
+        mkspiffsCmd = "mkspiffs";
+
+    File tool = new File(platform.getFolder() + "/tools", mkspiffsCmd);
+    if (!tool.exists()) {
+        tool = new File(PreferencesData.get("runtime.tools.mkspiffs.path"), mkspiffsCmd);
+        if (!tool.exists()) {
+            System.err.println();
+            editor.statusError("SPIFFS Error: mkspiffs not found!");
+            return;
+        }
     }
 
     int fileCount = 0;