check-stylish: better support for -c & -u switches

Use `fd` & ignore file list, in the same way when no option is passed.
IntersectMBO · Sep 20, 2024 · fada7c9 · fada7c9
1 parent aab8d3b
commit fada7c9
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/scripts/ci/check-stylish.sh b/scripts/ci/check-stylish.sh
@@ -31,14 +31,8 @@ while getopts ${optstring} arg; do
     c)
       PATHS=$(git show --pretty='' --name-only HEAD)
       for path in $PATHS; do
-        if [ "${path##*.}" == "hs" ]; then
-          if grep -qE '^#' $path; then
-            echo "$path contains CPP.  Skipping."
-          else
-            echo $path
-            stylish-haskell $STYLISH_HASKELL_ARGS $path
-          fi
-        fi
+        echo $path
+        fd -e hs --ignore-file ./scripts/ci/check-stylish-ignore --full-path $path -X stylish-haskell $STYLISH_HASKELL_ARGS
       done
       if [ $USE_GIT == 1 ]; then
         git --no-pager diff --exit-code
@@ -49,12 +43,8 @@ while getopts ${optstring} arg; do
       PATHS=$(git diff --name-only HEAD)
       for path in $PATHS; do
         if [ "${path##*.}" == "hs" ]; then
-          if grep -qE '^#' $path; then
-            echo "$path contains CPP.  Skipping."
-          else
-            echo $path
-            stylish-haskell $STYLISH_HASKELL_ARGS $path
-          fi
+          echo $path
+          fd -e hs --ignore-file ./scripts/ci/check-stylish-ignore --full-path $path -X stylish-haskell $STYLISH_HASKELL_ARGS
         fi
       done
       if [ $USE_GIT == 1 ]; then