From cb9c43171eb9efa7f4c655b5eb0be7016c7b4742 Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Wed, 1 May 2024 13:52:24 +1000
Subject: [PATCH] Match outboard filename without board revision

---
 .github/workflows/main.yml | 4 ++--
 readme.org                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8bb5f29..a6e939d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -92,13 +92,13 @@ jobs:
           fi
           echo "shield_arg=$SHIELD_ARG" >> $GITHUB_OUTPUT
           keyboard_split="$keyboard"
-          keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
+          keyboard_base=`echo "$keyboard" | sed -e 's/_\(left\|right\)//' -e 's/@.*//'`
 
           configfile="${GITHUB_WORKSPACE}/miryoku_zmk/miryoku/custom_config.h"
 
           tmpfile="$configfile.tmp"
           echo -n '#define ' > "$tmpfile"
-          echo -n "MIRYOKU_KEYBOARD_$keyboard_base" | tr  -c '[:alnum:]' '_' |tr '[:lower:]' '[:upper:]' >> "$tmpfile"
+          echo -n "MIRYOKU_KEYBOARD_$keyboard_base" | tr  -c '[:alnum:]' '_' | tr '[:lower:]' '[:upper:]' >> "$tmpfile"
           echo >> "$tmpfile"
           cat "$configfile" >> "$tmpfile"
           mv "$tmpfile" "$configfile"
diff --git a/readme.org b/readme.org
index fee78fa..0619db7 100644
--- a/readme.org
+++ b/readme.org
@@ -225,7 +225,7 @@ See https://github.com/manna-harbour/miryoku/discussions/81 for available and su
 
 Outboards are files containing out-of-tree board and shield definition metadata.
 
-Files are at [[.github/workflows/outboards]]. Outboards for boards and shields are contained in the corresponding subdirectories. Files are named after the board or shield.
+Files are at [[.github/workflows/outboards]]. Outboards for boards and shields are contained in the corresponding subdirectories. Files are named after the base board or shield name (i.e. without revision or ~_left~ / ~_right~ suffixes).
 
 Outboards contain Bourne shell variable assignments. Supported variables are described below. See the files for samples.