From 5895637e9ab98c13fb653e0153e67522a50d7f23 Mon Sep 17 00:00:00 2001 From: Mark Furland Date: Thu, 2 Jan 2020 19:26:34 -0500 Subject: [PATCH] fix: http-uploader.py cross platform support, espupload.py executable --- pio/espupload.py | 0 pio/http-uploader.py | 8 ++------ 2 files changed, 2 insertions(+), 6 deletions(-) mode change 100644 => 100755 pio/espupload.py diff --git a/pio/espupload.py b/pio/espupload.py old mode 100644 new mode 100755 diff --git a/pio/http-uploader.py b/pio/http-uploader.py index dd563177f..88d5a23ce 100644 --- a/pio/http-uploader.py +++ b/pio/http-uploader.py @@ -1,4 +1,5 @@ Import("env") +import os # pio < 4.0.0 # from base64 import b64decode @@ -7,11 +8,6 @@ Import("env") # env.Replace(UPLOADCMD="$UPLOADER -u " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + " -f $SOURCES") # pio >= 4.0.0 -env.Replace(UPLOADER="pio\espupload.py") +env.Replace(UPLOADER=os.path.join("pio", "espupload.py")) env.Replace(UPLOADERFLAGS="") env.Replace(UPLOADCMD="$UPLOADER -u $UPLOAD_PORT -f $SOURCES") - -''' -env.Replace(UPLOADCMD="pio\espupload.py -f $SOURCES") # Windows -env.Replace(UPLOADCMD="pio/espupload.py -f $SOURCES") # Linux -''' \ No newline at end of file