From 6208e6ba1f2faf6ab66f97041fa98e23e96caa34 Mon Sep 17 00:00:00 2001
From: Rick Hewes <rick_hewes@nominatebill.co.uk>
Date: Wed, 8 Aug 2018 17:04:44 +0100
Subject: [PATCH 1/3] Update README

Add comment for Linux based OSs
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2d20d3b..9486bd4 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Tested with the following Arduino IDE versions: 1.6.5-r2,
 - Unpack the tool into tools directory (the path will look like `<home_dir>/Arduino/tools/ESP8266FS/tool/esp8266fs.jar)`.
 - Restart Arduino IDE. 
 
-On the OS X create the tools directory in ~/Documents/Arduino/ and unpack the files there
+On OS X and Linux based OSs create the tools directory in ~/Documents/Arduino/ and unpack the files there
 
 ## Usage
 - Open a sketch (or create a new one and save it).

From 64082855fe558d9a546b88ba0282e09775345584 Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Mon, 18 Nov 2019 21:16:12 -0800
Subject: [PATCH 2/3] Fix uploader for python3 compat and core 2.6.x

The core moved to python3 because python (2) is EOL on January 1, 2020.
Move the search paths and platform variables to use python3 instead.

Remove the no longer needed --end parameter to upload.py
---
 src/ESP8266FS.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ESP8266FS.java b/src/ESP8266FS.java
index 95a51e7..81b55ef 100644
--- a/src/ESP8266FS.java
+++ b/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,7 +224,7 @@ 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()) {
@@ -232,7 +232,7 @@ private void createAndUpload(){
         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});
       }

From 56a6c515545ff5301be5e679d014ab7062600d81 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Mon, 25 Nov 2019 11:37:48 +0200
Subject: [PATCH 3/3] change target version

---
 make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make.sh b/make.sh
index 9a7702e..6d76779 100755
--- a/make.sh
+++ b/make.sh
@@ -19,7 +19,7 @@ echo "lib_path: $lib_path"
 set -e
 
 mkdir -p bin
-javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
+javac -target 11 -cp "$pde_path:$core_path:$lib_path" \
       -d bin src/ESP8266FS.java
 
 pushd bin