fix maual west workspace init in container script

Author: MSmaili

tools/docker/build-profile-in-container.sh

@@ -6,41 +6,43 @@ use_dongle="${2:-0}"
 build_matrix_path="/zmk-config/build.yaml"
 
 if [[ -z "${keyboard}" ]]; then
-	echo "Keyboard is required." >&2
-	exit 1
+    echo "Keyboard is required." >&2
+    exit 1
 fi
 
 if [[ ! -f "${build_matrix_path}" ]]; then
-	echo "Build matrix file not found: ${build_matrix_path}" >&2
-	exit 1
+    echo "Build matrix file not found: ${build_matrix_path}" >&2
+    exit 1
 fi
 
 cd /work
 
 if [[ ! -d .west ]]; then
-	west init -l /zmk-config/config
+    mkdir -p .west
+    printf '[manifest]\npath = config\nfile = west.yml\n' > .west/config
+    ln -sfn /zmk-config/config config
 fi
 
 if [[ ! -d zmk || ! -d zephyr ]]; then
-	west update
+    west update
 fi
 
 right_artifact="${keyboard}_right"
 if [[ "${use_dongle}" == "1" ]]; then
-	target_artifacts=(
-		"${keyboard}_left_peripheral"
-		"${right_artifact}"
-		"${keyboard}_dongle"
-	)
+    target_artifacts=(
+        "${keyboard}_left_peripheral"
+        "${right_artifact}"
+        "${keyboard}_dongle"
+    )
 else
-	target_artifacts=(
-		"${right_artifact}"
-		"${keyboard}_left_central"
-	)
+    target_artifacts=(
+        "${right_artifact}"
+        "${keyboard}_left_central"
+    )
 fi
 
 mapfile -t artifact_specs < <(
-	python3 - "${build_matrix_path}" "${target_artifacts[@]}" <<'PY'
+    python3 - "${build_matrix_path}" "${target_artifacts[@]}" <<'PY'
 import sys
 
 try:
@@ -77,45 +79,45 @@ PY
 )
 
 if [[ "${#artifact_specs[@]}" -ne "${#target_artifacts[@]}" ]]; then
-	echo "Failed to resolve build specs for ${keyboard}" >&2
-	exit 1
+    echo "Failed to resolve build specs for ${keyboard}" >&2
+    exit 1
 fi
 
 mkdir -p /out
 
 for spec in "${artifact_specs[@]}"; do
-	IFS=$'\x1f' read -r artifact_name board shield snippet cmake_args_raw <<<"${spec}"
-
-	if [[ -z "${board}" || -z "${shield}" ]]; then
-		echo "Invalid build matrix entry for ${artifact_name}: board/shield is missing" >&2
-		exit 1
-	fi
-
-	build_dir="/work/build/${artifact_name}"
-	west_extra_args=()
-	cmake_args=(
-		-DSHIELD="${shield}"
-		-DZMK_CONFIG=/zmk-config/config
-		-DZMK_EXTRA_MODULES=/zmk-config
-		-DZEPHYR_BASE=/work/zephyr
-		-DZephyr_DIR=/work/zephyr/share/zephyr-package/cmake
-	)
-
-	if [[ -n "${snippet}" ]]; then
-		west_extra_args=(-S "${snippet}")
-	fi
-
-	if [[ -n "${cmake_args_raw}" ]]; then
-		# shellcheck disable=SC2206
-		extra_cmake_args=(${cmake_args_raw})
-		cmake_args+=("${extra_cmake_args[@]}")
-	fi
-
-	echo "==> Building ${artifact_name}"
-	rm -rf "${build_dir}"
-	west build -d "${build_dir}" -b "${board}" "${west_extra_args[@]}" /work/zmk/app -- "${cmake_args[@]}"
-
-	if [[ -f "${build_dir}/zephyr/zmk.uf2" ]]; then
-		cp "${build_dir}/zephyr/zmk.uf2" "/out/${artifact_name}.uf2"
-	fi
+    IFS=$'\x1f' read -r artifact_name board shield snippet cmake_args_raw <<<"${spec}"
+
+    if [[ -z "${board}" || -z "${shield}" ]]; then
+        echo "Invalid build matrix entry for ${artifact_name}: board/shield is missing" >&2
+        exit 1
+    fi
+
+    build_dir="/work/build/${artifact_name}"
+    west_extra_args=()
+    cmake_args=(
+        -DSHIELD="${shield}"
+        -DZMK_CONFIG=/zmk-config/config
+        -DZMK_EXTRA_MODULES=/zmk-config
+        -DZEPHYR_BASE=/work/zephyr
+        -DZephyr_DIR=/work/zephyr/share/zephyr-package/cmake
+    )
+
+    if [[ -n "${snippet}" ]]; then
+        west_extra_args=(-S "${snippet}")
+    fi
+
+    if [[ -n "${cmake_args_raw}" ]]; then
+        # shellcheck disable=SC2206
+        extra_cmake_args=(${cmake_args_raw})
+        cmake_args+=("${extra_cmake_args[@]}")
+    fi
+
+    echo "==> Building ${artifact_name}"
+    rm -rf "${build_dir}"
+    west build -d "${build_dir}" -b "${board}" "${west_extra_args[@]}" /work/zmk/app -- "${cmake_args[@]}"
+
+    if [[ -f "${build_dir}/zephyr/zmk.uf2" ]]; then
+        cp "${build_dir}/zephyr/zmk.uf2" "/out/${artifact_name}.uf2"
+    fi
 done

tools/docker/draw-in-container.sh

@@ -4,13 +4,13 @@ set -euo pipefail
 KEYMAP_PATH="${1:-}"
 
 if [[ -z "${KEYMAP_PATH}" ]]; then
-	echo "No keymap was provided." >&2
-	exit 1
+    echo "No keymap was provided." >&2
+    exit 1
 fi
 
 if [[ ! -f "/zmk-config/${KEYMAP_PATH}" ]]; then
-	echo "Keymap not found: /zmk-config/${KEYMAP_PATH}" >&2
-	exit 1
+    echo "Keymap not found: /zmk-config/${KEYMAP_PATH}" >&2
+    exit 1
 fi
 
 export HOME="/work/home"
@@ -19,9 +19,11 @@ mkdir -p "${HOME}"
 cd /work
 
 if [[ ! -d .west ]]; then
-	west init -l /zmk-config/config
-	west config --local manifest.project-filter "-zmk,-zephyr"
-	west update --fetch-opt=--filter=tree:0
+    mkdir -p .west
+    printf '[manifest]\npath = config\nfile = west.yml\n' > .west/config
+    ln -sfn /zmk-config/config config
+    west config --local -- manifest.project-filter "-zmk,-zephyr"
+    west update --fetch-opt=--filter=tree:0
 fi
 
 keyboard="$(basename "${KEYMAP_PATH}" .keymap)"