Merge pull request #65 from earlephilhower/fix2.6.0

Fix uploader for python3 compat and core 2.6.x

Author: me-no-dev

Diff for: src/ESP8266FS.java

@@ -208,7 +208,7 @@ private void createAndUpload(){
     File espota = new File(platform.getFolder()+"/tools");
     File esptool = new File(platform.getFolder()+"/tools");
     String serialPort = PreferencesData.get("serial.port");
-    String pythonCmd = PreferencesData.get("runtime.os").contentEquals("windows") ? "python.exe" : "python";
+    String pythonCmd = PreferencesData.get("runtime.os").contentEquals("windows") ? "python3.exe" : "python3";
     String uploadCmd = "";
 
     //make sure the serial port or IP is defined
@@ -224,15 +224,15 @@ private void createAndUpload(){
       uploadCmd = uploadPyFile.getAbsolutePath();
     }
     // Find python.exe if present, don't fail if not found for backwards compat
-    String[] paths = { platform.getFolder()+"/tools", platform.getFolder()+"/tools/python", PreferencesData.get("runtime.tools.python.path") };
+    String[] paths = { platform.getFolder()+"/tools", platform.getFolder()+"/tools/python3", PreferencesData.get("runtime.tools.python3.path") };
     for (String s: paths) {
       File toolPyFile = new File(s, pythonCmd);
       if (toolPyFile.exists() && toolPyFile.isFile() && toolPyFile.canExecute()) {
         pythonCmd = toolPyFile.getAbsolutePath();
         break;
       }
     }
-    // pythonCmd now points to either an installed exe with full path or just plain "python(.exe)"
+    // pythonCmd now points to either an installed exe with full path or just plain "python3(.exe)"
 
     //find espota if IP else find esptool
     if(serialPort.split("\\.").length == 4){
@@ -331,7 +331,7 @@ private void createAndUpload(){
       }
       System.out.println();
       if (!uploadCmd.isEmpty()) {
-        sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", uploadSpeed, "write_flash", uploadAddress, imagePath, "--end"});
+        sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", uploadSpeed, "write_flash", uploadAddress, imagePath});
       } else {
         sysExec(new String[]{esptool.getAbsolutePath(), "-cd", resetMethod, "-cb", uploadSpeed, "-cp", serialPort, "-ca", uploadAddress, "-cf", imagePath});
       }