More flexible build routine

scripts/zmk_build.sh

@@ -1,17 +1,82 @@
 #!/usr/bin/env bash
 
-WEST_OPTS="$@"
-OUTPUT_DIR="$WINHOME/Downloads"
-
-HOST_ZMK_DIR="$HOME/zmk"
-HOST_CONFIG_DIR="$HOME/zmk-config"
-
 RUNWITH_DOCKER=true
-DOCKER_SUDO="sudo"  # leave empty if user is in docker group
-DOCKER_VERSION="zmkfirmware/zmk-dev-arm:3.0"
 
-DOCKER_ZMK_DIR="/workspace/zmk"
+while [[ $# -gt 0 ]]; do
-DOCKER_CONFIG_DIR="/workspace/zmk-config"
+    case $1 in
+        # needed when user isn't in docker group
+        -s|--su)
+            DOCKER_SUDO="sudo"
+            ;;
+
+        -l|--local)
+            RUNWITH_DOCKER="false"
+            ;;
+
+        # comma or space separated list of boards (use quotes if space separated)
+        # if ommitted, will compile list of boards in build.yaml
+        -b|--board)
+            BOARDS="$2"
+            shift
+            ;;
+
+        -v|--version)
+            WEST_VERSION="$2"
+            shift
+            ;;
+
+        -o|--output-dir)
+            OUTPUT_DIR="$2"
+            shift
+            ;;
+
+        --host-config-dir)
+            HOST_CONFIG_DIR="$2"
+            shift
+            ;;
+
+        --host-zmk-dir)
+            HOST_ZMK_DIR="$2"
+            shift
+            ;;
+
+        --docker-config-dir)
+            DOCKER_CONFIG_DIR="$2"
+            shift
+            ;;
+
+        --docker-zmk-dir)
+            DOCKER_ZMK_DIR="$2"
+            shift
+            ;;
+
+        --)
+            WEST_OPTS="${@:2}"
+            break
+            ;;
+
+        *)
+            echo "Unknown option $1"
+            exit 1
+            ;;
+
+    esac
+    shift
+done
+
+# Set defaults
+[[ -z $WEST_VERSION ]] && WEST_VERSION="3.0"
+[[ -z $OUTPUT_DIR ]] && OUTPUT_DIR="$WINHOME/Downloads"
+
+[[ -z $HOST_ZMK_DIR ]] && HOST_ZMK_DIR="$HOME/zmk"
+[[ -z $HOST_CONFIG_DIR ]] && HOST_CONFIG_DIR="$HOME/zmk-config"
+
+[[ -z $DOCKER_ZMK_DIR ]] && DOCKER_ZMK_DIR="/workspace/zmk"
+[[ -z $DOCKER_CONFIG_DIR ]] && DOCKER_CONFIG_DIR="/workspace/zmk-config"
+
+[[ -z $BOARDS ]] && BOARDS="$(grep '^[[:space:]]*\-[[:space:]]*board:' $HOST_CONFIG_DIR/build.yaml | sed 's/^.*: *//')"
+
+DOCKER_IMG="zmkfirmware/zmk-dev-arm:$WEST_VERSION"
 
 # +-------------------------+
 # | AUTOMATE CONFIG OPTIONS |
@@ -49,41 +114,46 @@ then
     DOCKER_CMD="$DOCKER_SUDO docker run --name zmk --rm -w $DOCKER_ZMK_DIR/app \
         --mount type=bind,source=$HOST_ZMK_DIR,target=$DOCKER_ZMK_DIR \
         --mount type=bind,source=$HOST_CONFIG_DIR,target=$DOCKER_CONFIG_DIR,readonly \
-        --mount type=volume,source=zmk-root-user,target=/root \
+        --mount type=volume,source=zmk-root-user-$WEST_VERSION,target=/root \
-        --mount type=volume,source=zmk-zephyr,target=$DOCKER_ZMK_DIR/zephyr \
+        --mount type=volume,source=zmk-zephyr-$WEST_VERSION,target=$DOCKER_ZMK_DIR/zephyr \
-        --mount type=volume,source=zmk-zephyr-modules,target=$DOCKER_ZMK_DIR/modules \
+        --mount type=volume,source=zmk-zephyr-modules-$WEST_VERSION,target=$DOCKER_ZMK_DIR/modules \
-        --mount type=volume,source=zmk-zephyr-tools,target=$DOCKER_ZMK_DIR/tools \
+        --mount type=volume,source=zmk-zephyr-tools-$WEST_VERSION,target=$DOCKER_ZMK_DIR/tools \
-        $DOCKER_VERSION"
+        $DOCKER_IMG"
-    SUFFIX="_docker"
+    SUFFIX="${WEST_VERSION}_docker"
     CONFIG_DIR="$DOCKER_CONFIG_DIR/config"
 
 else
     echo "Build mode: local"
-    DOCKER_CMD=
+    SUFFIX="${WEST_VERSION}"
-    SUFFIX=
     CONFIG_DIR="$HOST_CONFIG_DIR/config"
 fi
 
-# usage: compile_board [board] [bin|uf2]
+# usage: compile_board board
 compile_board () {
     echo -e "\n$(tput setaf 4)Building $1$(tput sgr0)"
-    $DOCKER_CMD west build -d "build/$1$SUFFIX" -b $1 $WEST_OPTS \
+    BUILD_DIR="${1}_$SUFFIX"
+    $DOCKER_CMD west build -d "build/$BUILD_DIR" -b $1 $WEST_OPTS \
         -- -DZMK_CONFIG="$CONFIG_DIR" -Wno-dev
     if [[ $? -eq 0 ]]
     then
         echo "$(tput setaf 4)Success: $1 done$(tput sgr0)"
-        OUTPUT="$OUTPUT_DIR/$1-zmk.$2"
+        if [[ -f $HOST_ZMK_DIR/app/build/$BUILD_DIR/zephyr/zmk.uf2 ]]
+        then
+            TYPE="uf2"
+        else
+            TYPE="bin"
+        fi
+        OUTPUT="$OUTPUT_DIR/$1-zmk.$TYPE"
         [[ -f $OUTPUT ]] && [[ ! -L $OUTPUT ]] && mv "$OUTPUT" "$OUTPUT.bak"
-        cp "$HOST_ZMK_DIR/app/build/$1/zephyr/zmk.$2" "$OUTPUT"
+        cp "$HOST_ZMK_DIR/app/build/$BUILD_DIR/zephyr/zmk.$TYPE" "$OUTPUT"
     else
         echo "$(tput setaf 1)Error: $1 failed$(tput sgr0)"
     fi
 }
 
 cd "$HOST_ZMK_DIR/app"
-compile_board planck_rev6 bin
+for board in $(echo $BOARDS | sed 's/,/ /g')
-compile_board corneish_zen_v2_left uf2
+do
-compile_board corneish_zen_v2_right uf2
+    compile_board $board
-compile_board adv360pro_left uf2
+done
-compile_board adv360pro_right uf2
 

scripts/zmk_docker_install.sh

@@ -1,25 +1,57 @@
 #!/usr/bin/env bash
 
-HOST_ZMK_DIR="$HOME/zmk"
+# Parse input arguments
-DOCKER_ZMK_DIR="/workspace/zmk"
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        # needed when user isn't in docker group
+        -s|--sudu)
+            SUDO="sudo"
+            ;;
 
-DOCKER_VERSION="zmkfirmware/zmk-dev-arm:3.0"
+        -v|--version)
+            WEST_VERSION="$2"
+            shift
+            ;;
 
-DOCKER_SUDO="sudo"  # leave empty if user is in docker group
+        --host-zmk-dir)
-DOCKER_CMD="$DOCKER_SUDO docker run --name zmk --rm \
+            HOST_ZMK_DIR="$2"
+            shift
+            ;;
+
+        --docker-zmk-dir)
+            DOCKER_ZMK_DIR="$2"
+            shift
+            ;;
+
+        *)
+            echo "Unknown option $1"
+            exit 1
+            ;;
+
+    esac
+    shift
+done
+
+# Set defaults
+[[ -z $WEST_VERSION ]] && WEST_VERSION="3.0"
+[[ -z $HOST_ZMK_DIR ]] && HOST_ZMK_DIR="$HOME/zmk"
+[[ -z $DOCKER_ZMK_DIR ]] && DOCKER_ZMK_DIR="/workspace/zmk"
+
+DOCKER_IMG="zmkfirmware/zmk-dev-arm:$WEST_VERSION"
+DOCKER_CMD="$SUDO docker run --name zmk-$WEST_VERSION --rm \
     --mount type=bind,source=$HOST_ZMK_DIR,target=$DOCKER_ZMK_DIR \
-    --mount type=volume,source=zmk-root-user,target=/root \
+    --mount type=volume,source=zmk-root-user-$WEST_VERSION,target=/root \
-    --mount type=volume,source=zmk-zephyr,target=$DOCKER_ZMK_DIR/zephyr \
+    --mount type=volume,source=zmk-zephyr-$WEST_VERSION,target=$DOCKER_ZMK_DIR/zephyr \
-    --mount type=volume,source=zmk-zephyr-modules,target=$DOCKER_ZMK_DIR/modules \
+    --mount type=volume,source=zmk-zephyr-modules-$WEST_VERSION,target=$DOCKER_ZMK_DIR/modules \
-    --mount type=volume,source=zmk-zephyr-tools,target=$DOCKER_ZMK_DIR/tools"
+    --mount type=volume,source=zmk-zephyr-tools-$WEST_VERSION,target=$DOCKER_ZMK_DIR/tools"
 
 # Reset volumes
-$DOCKER_SUDO docker volume rm $(sudo docker volume ls -q | grep zmk-)
+$SUDO docker volume rm $(sudo docker volume ls -q | grep "^zmk-.*-$WEST_VERSION$")
 
 # Install west
-$DOCKER_CMD -w "$DOCKER_ZMK_DIR" "$DOCKER_VERSION" west init -l app/
+$DOCKER_CMD -w "$DOCKER_ZMK_DIR" "$DOCKER_IMG" west init -l app/
-$DOCKER_CMD -w "$DOCKER_ZMK_DIR" "$DOCKER_VERSION" west update
+$DOCKER_CMD -w "$DOCKER_ZMK_DIR" "$DOCKER_IMG" west update
 
 # Install docosaurus
-$DOCKER_CMD -w "$DOCKER_ZMK_DIR/docs" "$DOCKER_VERSION" npm ci
+$DOCKER_CMD -w "$DOCKER_ZMK_DIR/docs" "$DOCKER_IMG" npm ci