From 57c25211070eecfa6e88dda68d58548ed1860ad8 Mon Sep 17 00:00:00 2001
From: aidenvaines-cgi <aiden.vaines@cgi.com>
Date: Wed, 8 Apr 2026 09:34:50 +0100
Subject: [PATCH] CCM-16537 Fixing paths for precommits

---
 .../check-english-usage.sh                    | 32 +++++++++++++-----
 .../check-file-format/check-file-format.sh    | 33 +++++++++++++++----
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/.github/actions/check-english-usage/check-english-usage.sh b/.github/actions/check-english-usage/check-english-usage.sh
index b3942de..854ecbc 100755
--- a/.github/actions/check-english-usage/check-english-usage.sh
+++ b/.github/actions/check-english-usage/check-english-usage.sh
@@ -31,16 +31,16 @@ function main() {
   check=${check:-working-tree-changes}
   case $check in
     "all")
-      filter="git ls-files"
+      filter="git ls-files -z"
       ;;
     "staged-changes")
-      filter="git diff --diff-filter=ACMRT --name-only --cached"
+      filter="git diff --diff-filter=ACMRT --name-only --cached -z"
       ;;
     "working-tree-changes")
-      filter="git diff --diff-filter=ACMRT --name-only"
+      filter="git diff --diff-filter=ACMRT --name-only -z"
       ;;
     "branch")
-      filter="git diff --diff-filter=ACMRT --name-only ${BRANCH_NAME:-origin/main}"
+      filter="git diff --diff-filter=ACMRT --name-only -z ${BRANCH_NAME:-origin/main}"
       ;;
     *)
       echo "Unrecognised check mode: $check" >&2 && exit 1
@@ -59,10 +59,17 @@ function main() {
 #   filter=[git command to filter the files to check]
 function run-vale-natively() {
 
-  # shellcheck disable=SC2046
+  local files=()
+  while IFS= read -r -d '' file; do
+    files+=("$file")
+  done < <($filter)
+
+  # If no files found, exit successfully
+  [[ ${#files[@]} -eq 0 ]] && return 0
+
   vale \
     --config "$PWD/scripts/config/vale/vale.ini" \
-    $($filter)
+    "${files[@]}"
 }
 
 # Run Vale in a Docker container.
@@ -75,17 +82,26 @@ function run-vale-in-docker() {
 
   # shellcheck disable=SC2155
   local image=$(name=jdkato/vale docker-get-image-version-and-pull)
+
+  local files=()
+  while IFS= read -r -d '' file; do
+    files+=("$file")
+  done < <($filter)
+
   # We use /dev/null here to stop `vale` from complaining that it's
   # not been called correctly if the $filter happens to return an
   # empty list. As long as there's a filename, even if it's one that
   # will be ignored, `vale` is happy.
-  # shellcheck disable=SC2046,SC2086
+  if [[ ${#files[@]} -eq 0 ]]; then
+    files=(/dev/null)
+  fi
+
   docker run --rm --platform linux/amd64 \
     --volume "$PWD:/workdir" \
     --workdir /workdir \
     "$image" \
       --config /workdir/scripts/config/vale/vale.ini \
-      $($filter) /dev/null
+      "${files[@]}"
 }
 
 # ==============================================================================
diff --git a/.github/actions/check-file-format/check-file-format.sh b/.github/actions/check-file-format/check-file-format.sh
index d7c9474..f7d3514 100755
--- a/.github/actions/check-file-format/check-file-format.sh
+++ b/.github/actions/check-file-format/check-file-format.sh
@@ -50,16 +50,16 @@ function main() {
   check=${check:-working-tree-changes}
   case $check in
     "all")
-      filter="git ls-files"
+      filter="git ls-files -z"
       ;;
     "staged-changes")
-      filter="git diff --diff-filter=ACMRT --name-only --cached"
+      filter="git diff --diff-filter=ACMRT --name-only --cached -z"
       ;;
     "working-tree-changes")
-      filter="git diff --diff-filter=ACMRT --name-only"
+      filter="git diff --diff-filter=ACMRT --name-only -z"
       ;;
     "branch")
-      filter="git diff --diff-filter=ACMRT --name-only ${BRANCH_NAME:-origin/main}"
+      filter="git diff --diff-filter=ACMRT --name-only -z ${BRANCH_NAME:-origin/main}"
       ;;
     *)
       echo "Unrecognised check mode: $check" >&2 && exit 1
@@ -79,9 +79,17 @@ function main() {
 #   filter=[git command to filter the files to check]
 function run-editorconfig-natively() {
 
-  # shellcheck disable=SC2046,SC2086
+  local files=()
+  while IFS= read -r -d '' file; do
+    files+=("$file")
+  done < <($filter)
+
+  # If no files found, exit successfully
+  [[ ${#files[@]} -eq 0 ]] && return 0
+
+  # shellcheck disable=SC2086
   editorconfig \
-    --exclude '.git/' $dry_run_opt $($filter)
+    --exclude '.git/' $dry_run_opt "${files[@]}"
 }
 
 # Run editorconfig in a Docker container.
@@ -95,13 +103,24 @@ function run-editorconfig-in-docker() {
 
   # shellcheck disable=SC2155
   local image=$(name=mstruebing/editorconfig-checker docker-get-image-version-and-pull)
+
+  local files=()
+  while IFS= read -r -d '' file; do
+    files+=("$file")
+  done < <($filter)
+
   # We use /dev/null here as a backstop in case there are no files in the state
   # we choose. If the filter comes back empty, adding `/dev/null` onto it has
   # the effect of preventing `ec` from treating "no files" as "all the files".
+  if [[ ${#files[@]} -eq 0 ]]; then
+    files=(/dev/null)
+  fi
+
+  # shellcheck disable=SC2086
   docker run --rm --platform linux/amd64 \
     --volume "$PWD":/check \
     "$image" \
-      sh -c "ec --exclude '.git/' $dry_run_opt \$($filter) /dev/null"
+      ec --exclude '.git/' $dry_run_opt "${files[@]}"
 }
 
 # ==============================================================================