From 3bcb4ee33260319f0721257476d7a317ffd60fa0 Mon Sep 17 00:00:00 2001 From: jakobst1n Date: Mon, 18 Dec 2023 13:21:30 +0100 Subject: Fix build script, small keymap changes --- bin/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/build.sh b/bin/build.sh index 04a671c..330f0d3 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -157,14 +157,14 @@ CONFIG_DIR="$DOCKER_CONFIG_DIR/config" compile_board () { board=$(echo "$1" | jq -r '.board') shield=$(echo "$1" | jq -r '.shield // ""') - [[ -z $shield ]] && shield="" || shield="-DSHIELD=${shield}" + [[ -z $shield ]] && shield_opts="" || shield_opts="-DSHIELD=${shield}" BUILD_DIR="${board}_${shield}_$SUFFIX" LOGFILE="$LOG_DIR/zmk_build_$board_$shield.log" [[ $MULTITHREAD = "true" ]] || echo -en "\n$(tput setaf 2)Building $1... $(tput sgr0)" [[ $MULTITHREAD = "true" ]] && echo -e "$(tput setaf 2)Building $1... $(tput sgr0)" $DOCKER_PREFIX west build -d "build/$BUILD_DIR" -b $board $WEST_OPTS \ - -- -DZMK_CONFIG="$CONFIG_DIR" $shield -Wno-dev > "$LOGFILE" 2>&1 + -- -DZMK_CONFIG="$CONFIG_DIR" $shield_opts -Wno-dev > "$LOGFILE" 2>&1 if [[ $? -eq 0 ]] then [[ $MULTITHREAD = "true" ]] || echo "$(tput setaf 2)done$(tput sgr0)" -- cgit v1.2.3