Fix pio 4.0.0 related issues

Fix pio 4.0.0 related issues (#2759)
arendst · Jul 21, 2019 · 3a3e5a9 · 3a3e5a9
1 parent 5953b8b
commit 3a3e5a9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git 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
@@ -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"')