From 3a3e5a946456ff5926e9a59a77f2147ecd895ce2 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 21 Jul 2019 12:22:44 +0200
Subject: [PATCH] Fix pio 4.0.0 related issues

Fix pio 4.0.0 related issues (#2759)
---
 pio/http-uploader.py |  9 +++++++--
 pio/sftp-uploader.py | 10 ++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pio/http-uploader.py b/pio/http-uploader.py
index b80ee4a09..dd563177f 100644
--- a/pio/http-uploader.py
+++ b/pio/http-uploader.py
@@ -1,10 +1,15 @@
 Import("env")
 
-from base64 import b64decode
+# pio < 4.0.0
+# from base64 import b64decode
+# env.Replace(UPLOADER="pio\espupload.py")
+# env.Replace(UPLOADERFLAGS="")
+# env.Replace(UPLOADCMD="$UPLOADER -u " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + " -f $SOURCES")
 
+# pio >= 4.0.0
 env.Replace(UPLOADER="pio\espupload.py")
 env.Replace(UPLOADERFLAGS="")
-env.Replace(UPLOADCMD="$UPLOADER -u " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + " -f $SOURCES")
+env.Replace(UPLOADCMD="$UPLOADER -u $UPLOAD_PORT -f $SOURCES")
 
 '''
 env.Replace(UPLOADCMD="pio\espupload.py -f $SOURCES") # Windows
diff --git a/pio/sftp-uploader.py b/pio/sftp-uploader.py
index c6fe9fb84..b39f76338 100644
--- a/pio/sftp-uploader.py
+++ b/pio/sftp-uploader.py
@@ -1,6 +1,12 @@
 Import("env")
-from base64 import b64decode
 
+# pio < 4.0.0
+# from base64 import b64decode
+# env.Replace(UPLOADER="scp")
+# env.Replace(UPLOADERFLAGS="")
+# env.Replace(UPLOADCMD="$UPLOADER $SOURCES " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + "/" + b64decode(ARGUMENTS.get("PIOENV")) + ".bin")
+
+# pio >= 4.0.0
 env.Replace(UPLOADER="scp")
 env.Replace(UPLOADERFLAGS="")
-env.Replace(UPLOADCMD="$UPLOADER $SOURCES " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + "/" + b64decode(ARGUMENTS.get("PIOENV")) + ".bin")
+env.Replace(UPLOADCMD='$UPLOADER $SOURCES "$UPLOAD_PORT/${PIOENV}.bin"')