From 3be6bec7eeeabafe883760d9fffeb1b06cbe0b0a Mon Sep 17 00:00:00 2001
From: Sadek Baroudi <sadekbaroudi@gmail.com>
Date: Sun, 30 Oct 2022 23:18:28 -0700
Subject: [PATCH] should not have been using .build directory for github build
 action, and updated build artifact name

---
 .github/workflows/firmware_build.yml |  2 +-
 bin/fp_build.sh                      | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/firmware_build.yml b/.github/workflows/firmware_build.yml
index 46f6db4885..26bc61d1f0 100755
--- a/.github/workflows/firmware_build.yml
+++ b/.github/workflows/firmware_build.yml
@@ -61,7 +61,7 @@ jobs:
         uses: actions/upload-artifact@v3
         continue-on-error: true
         with:
-          name: ${{ matrix.file }}_${{ github.actor }}
+          name: qmk_fingerpunch_${{ github.actor }}
           path: |
             *.hex
             *.bin
diff --git a/bin/fp_build.sh b/bin/fp_build.sh
index 2026878d42..59ef76e349 100755
--- a/bin/fp_build.sh
+++ b/bin/fp_build.sh
@@ -190,8 +190,13 @@ rename_file_from_build_string() {
                 token_file_prefix+="_${config_value}"
                 target_filename+="_${config_value}"
             else
-                # ,, converts to lowercase
-                target_filename+="_${config_param,,}"
+                # Make sure that the value is yes (it's enabled), otherwise we shouldn't include in the filename
+                if [[ "${config_value}" == "yes" ]]; then
+                    # ,, converts to lowercase
+                    target_filename+="_${config_param,,}"
+                    # remove _enable suffix as it's implied
+                    target_filename=${target_filename%"_enable"}
+                fi
             fi
         fi
         token_i+=1
@@ -200,10 +205,10 @@ rename_file_from_build_string() {
     echo "${0}: filename token is ${token_file_prefix}"
     echo "${0}: target filename is ${target_filename}"
 
-    hex_source_file=".build/${token_file_prefix}.hex"
-    uf2_source_file=".build/${token_file_prefix}.uf2"
-    hex_target_file=".build/${target_filename}.hex"
-    uf2_target_file=".build/${target_filename}.uf2"
+    hex_source_file="${token_file_prefix}.hex"
+    uf2_source_file="${token_file_prefix}.uf2"
+    hex_target_file="${target_filename}.hex"
+    uf2_target_file="${target_filename}.uf2"
 
     if test -f "${hex_source_file}"; then
         echo "${0}: Renaming file '${hex_source_file}' to '${hex_target_file}'"