Set up shfmt

bin/git-check-assertions

@@ -25,7 +25,10 @@
 set -euo pipefail
 
 assert_fails() {
-  ! "$@" || { echo "Expected command to fail, but it succeeded."; exit 1; }
+  ! "$@" || {
+    echo "Expected command to fail, but it succeeded."
+    exit 1
+  }
 }
 export -f assert_fails
 
@@ -42,9 +45,9 @@ for commit_hash in "${commits[@]}"; do
   git -c advice.detachedHead=false checkout -q "$commit_hash"
   commit_msg="$(git log -1 --format=%B "$commit_hash")"
   # shellcheck disable=SC2016
-  block="$(printf '%s\n' "$commit_msg" \
+  block="$(printf '%s\n' "$commit_msg" |
-    | sed -n '/^```git-check-assertions[[:space:]]*$/,/^```[[:space:]]*$/p' \
+    sed -n '/^```git-check-assertions[[:space:]]*$/,/^```[[:space:]]*$/p' |
-    | sed '1d;$d')"
+    sed '1d;$d')"
   if [ -n "$block" ]; then
     echo "git-check-assertions block in $commit_hash:"
     printf '%s\n' "$block" | sed 's/^/> /'

default.nix

@@ -8,6 +8,7 @@
   shellcheck-minimal,
   gitMinimal,
   resholve,
+  shfmt,
 }:
 
 let
@@ -20,6 +21,7 @@ resholve.mkDerivation {
   src = fs.toSource {
     root = ./.;
     fileset = fs.unions [
+      ./.editorconfig
       ./bin
       ./test
     ];
@@ -33,11 +35,13 @@ resholve.mkDerivation {
     shellcheck-minimal
     bats
     gitMinimal
+    shfmt
   ];
 
   checkPhase = ''
     runHook preCheck
     shellcheck bin/git-check-assertions test/git-check-assertions.bats
+    shfmt -d bin/git-check-assertions test/git-check-assertions.bats
     ./test/git-check-assertions.bats
     runHook postCheck
   '';

flake.nix

@@ -16,7 +16,10 @@
       {
         packages.default = pkgs.callPackage ./default.nix { };
         devShells.default = pkgs.mkShell {
-          packages = with pkgs; [ bats ];
+          packages = with pkgs; [
+            bats
+            shfmt
+          ];
         };
       }
     );

test/git-check-assertions.bats

@@ -4,7 +4,7 @@ setup() {
   load 'test_helper/bats-support/load'
   load 'test_helper/bats-assert/load'
 
-  DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )"
+  DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" >/dev/null 2>&1 && pwd)"
   PATH="$DIR/../bin:$PATH"
 
   git init -b main