From 373bf170f5a632377f9f1b9624ce83aba8e5c2f1 Mon Sep 17 00:00:00 2001 From: Jim Jowdy Date: Wed, 27 Dec 2023 04:59:59 -0800 Subject: [PATCH] Prefer `tr` to ${char^^}, which does not work on older bash versions (#303) * Prefer `tr` to ${char^^}, which does not work on older bash versions * Update CHANGELOG.md --------- Co-authored-by: ReFil <31960031+ReFil@users.noreply.github.com> --- CHANGELOG.md | 3 ++- bin/get_version.sh | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 536cedaaee..c5c3c96add 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Here's all notable changes and commits to both the configuration repo and the ba Many thanks to all those who have submitted issues and pull requests to make this firmware better! ## Config repo +12/27/2023 - Change how the characters are used in the versioning script for improved MacOS experience [#303](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/303) + 12/15/2022 - Update keymap.json to reflect new versioning macro [#300](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/300) 12/15/2023 - Add PR template [#293](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/293) @@ -38,7 +40,6 @@ Many thanks to all those who have submitted issues and pull requests to make thi 3/4/2023 - Add extra keys into matrix that point to nowhere, fixes spurious keypress issues when using USB3.1 cables [#114](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/114) [#116](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/116) - 2/14/2023 - Disable ZMK logging by default to improve power consumption [#101](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/101) 1/25/2023 - Fix automatic OS detection to build properly when using the local builder on OS-X [#91](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/91) diff --git a/bin/get_version.sh b/bin/get_version.sh index 6a5007b0f0..aa23e1719d 100755 --- a/bin/get_version.sh +++ b/bin/get_version.sh @@ -5,11 +5,18 @@ date=$(date -u +"%Y%m%d") branch=${1:-$(git rev-parse --abbrev-ref HEAD | cut -c1-4)} commit=${2:-$(git rev-parse --short HEAD)} +uppercase_char() { + local char=$1 + + (echo $char | tr '[a-z]' '[A-Z]' 2> /dev/null) || echo "${char^^}" +} + # Function to transform characters to ZMK key behaviours transform_char() { local char=$1 + if [[ $char =~ [A-Za-z] ]]; then - echo "<&kp ${char^^}>, " + echo "<&kp $(uppercase_char $char)>, " elif [[ $char =~ [0-9] ]]; then echo "<&kp N${char}>, " elif [ "$char" = "." ]; then