diff --git a/.gitea/workflows/check-format.yaml b/.gitea/workflows/check-format.yaml
index 4e8929e..d3fb2e0 100644
--- a/.gitea/workflows/check-format.yaml
+++ b/.gitea/workflows/check-format.yaml
@@ -27,3 +27,14 @@ jobs:
         run: |
           cd git/software/src &&
           find . -iname '*.py' -exec ../../../flake-venv/bin/flake8 {} +
+  Check-Bash-Shellcheck:
+    runs-on: ubuntu-22.04-full
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          path: git
+      - name: Check bash scripts
+        run: |
+          cd git/software &&
+          find . -path ./lib -prune -o -name "*.sh" -exec shellcheck {} +
diff --git a/software/build.sh b/software/build.sh
index de4c884..f2b28bc 100755
--- a/software/build.sh
+++ b/software/build.sh
@@ -5,10 +5,10 @@ TOPDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 set -eu
 
 ( cd lib/micropython
-  make -C mpy-cross -j $(nproc)
-  make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR=$TOPDIR/boards/RPI_PICO_W clean
-  make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR=$TOPDIR/boards/RPI_PICO_W \
-       USER_C_MODULES=$TOPDIR/src/audiocore/micropython.cmake -j $(nproc)
+  make -C mpy-cross -j "$(nproc)"
+  make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR="$TOPDIR"/boards/RPI_PICO_W clean
+  make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR="$TOPDIR"/boards/RPI_PICO_W \
+       USER_C_MODULES="$TOPDIR"/src/audiocore/micropython.cmake -j "$(nproc)"
 )
 
 echo "Output in lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/firmware.uf2"