Merge pull request #7418 from mtfurlan/fix/upload-script-fixing

fix: http-uploader.py cross platform support, espupload.py executable
This commit is contained in:
Theo Arends 2020-01-03 16:24:49 +01:00 committed by GitHub
commit e618767058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions

0
pio/espupload.py Normal file → Executable file
View File

View File

@ -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
'''