Address reviews

.github/workflows/check-formatting.yml

@@ -57,8 +57,7 @@ jobs:
             if grep -qE '^#' "$x"; then
               echo "$x contains CPP.  Skipping."
             else
-              fourmolu -q -i "$x"
-              stylish-haskell -i "$x"
+              "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
             fi
           fi
         done
@@ -75,8 +74,7 @@ jobs:
             if grep -qE '^#' "$x"; then
               echo "$x contains CPP.  Skipping."
             else
-              fourmolu -q -i "$x"
-              stylish-haskell -i "$x"
+              "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
             fi
           fi
         done

scripts/devshell/format → scripts/devshell/prettify

@@ -53,12 +53,31 @@ case $1 in
         ;;
 esac
 
-if [[ -z $files ]]; then
-    echo "No files to format!"
+if !(which stylish-haskell > /dev/null 2>&1); then
+    echo "ERROR: stylish-haskell is not available!"
+    echo -e
+    echo "Try entering the development shell with:"
+    echo "  nix develop"
+    exit 1
+fi
+
+if !(which fourmolu > /dev/null 2>&1); then
+    echo "ERROR: fourmolu is not available!"
     echo -e
-    show_help
+    echo "Try entering the development shell with:"
+    echo "  nix develop"
     exit 1
 fi
 
+
+if [[ -z $files ]]; then
+    echo "No files to format!"
+    if [[ -z $1 ]]; then
+      echo -e
+      show_help
+      exit 1
+    fi
+fi
+
 run_format $files
 

scripts/githooks/haskell-style-lint

@@ -14,8 +14,7 @@ for x in $(git diff --staged --name-only --diff-filter=ACM "*.hs" | tr '\n' ' ')
   if grep -qE '^#' "$x"; then
     echo "$x contains CPP.  Skipping."
   else
-    fourmolu -q -i "$x"
-    stylish-haskell -i "$x"
+    "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
   fi
   hlint "$x" || hlint_rc="1"
 done