From 46f4eef4286be7fc2ba9b072b0484d9fd7e2b7ac Mon Sep 17 00:00:00 2001 From: Maxim Prokhorov Date: Fri, 30 Aug 2024 15:47:24 +0300 Subject: [PATCH] pio: auth as literal string ref. https://scons.org/doc/production/HTML/scons-user.html#f-Literal > The specified string will be preserved as-is and not have construction variables expanded. resolve #1498 --- code/scripts/pio_pre.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/scripts/pio_pre.py b/code/scripts/pio_pre.py index d398b410..52fc949d 100644 --- a/code/scripts/pio_pre.py +++ b/code/scripts/pio_pre.py @@ -116,15 +116,19 @@ def ensure_platform_updated(): # using env instead of ini to avoid platformio ini changing hash on every change env.Append( ESPURNA_BOARD=os.environ.get("ESPURNA_BOARD", ""), - ESPURNA_AUTH=os.environ.get("ESPURNA_AUTH", ""), ESPURNA_FLAGS=os.environ.get("ESPURNA_FLAGS", ""), ) ESPURNA_OTA_PORT = os.environ.get("ESPURNA_IP") if ESPURNA_OTA_PORT: - env.Replace(UPLOAD_PROTOCOL="espota") - env.Replace(UPLOAD_PORT=ESPURNA_OTA_PORT) - env.Replace(UPLOAD_FLAGS="--auth=$ESPURNA_AUTH") + env.Replace( + ESPURNA_AUTH=env.Literal(os.environ.get("ESPURNA_AUTH", "")), + ) + env.Replace( + UPLOAD_PROTOCOL="espota", + UPLOAD_PORT=ESPURNA_OTA_PORT, + UPLOAD_FLAGS="--auth=$ESPURNA_AUTH", + ) else: env.Replace(UPLOAD_PROTOCOL="esptool")