From 728490875bb27db2b00602a615baa615ddec7f0c Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 10:38:07 +0000 Subject: [PATCH] fix: rename custom firmware - remove revision and repo name from firmware naming convention --- ESP/tools/customname.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ESP/tools/customname.py b/ESP/tools/customname.py index bac7428..20237ff 100644 --- a/ESP/tools/customname.py +++ b/ESP/tools/customname.py @@ -105,7 +105,7 @@ def customName(project, version, commit, branch): s = lambda x: x.replace('"', "") s = lambda x: x.replace("'", "") - env.Replace( + """ env.Replace( PROGNAME="%s-%s-%s-%s-%s" % ( s(defines.get("PIO_SRC_NAM")), @@ -114,6 +114,15 @@ def customName(project, version, commit, branch): s(defines.get("PIO_SRC_REV")), s(defines.get("PIO_SRC_BRH")), ) + ) """ + + env.Replace( + PROGNAME="%s-%s-%s" + % ( + str(env["PIOENV"]), + s(defines.get("PIO_SRC_TAG")), + s(defines.get("PIO_SRC_BRH")), + ) ) # detect if there is a forward slash in the PROGNAME and replace it with an underscore