Actually apply patches when testing in CI

Author: norm

Makefile

@@ -16,20 +16,20 @@ vaults: vault-dnd51 vault-dnd521
 assets: vault-dnd51-zip vault-dnd521-zip
 
 vault-dnd51:
-	./patches.sh dnd/51/markdown apply
-	python update_vault.py dnd/51/markdown dnd/51/obsidian_vault
-	./update_vault_indexes.sh dnd/51
-	./patches.sh dnd/51/obsidian_vault apply
+	@./patches.sh dnd/51/markdown apply
+	@python update_vault.py dnd/51/markdown dnd/51/obsidian_vault
+	@./update_vault_indexes.sh dnd/51
+	@./patches.sh dnd/51/obsidian_vault apply
 
 vault-dnd51-zip: vault-dnd51
 	rsync -av dnd/51/obsidian_vault/ /tmp/dnd_51_srd/
 	(cd /tmp && zip -r dnd_51_srd.zip dnd_51_srd/)
 
 vault-dnd521:
-	./patches.sh dnd/521/markdown apply
-	python update_vault.py dnd/521/markdown dnd/521/obsidian_vault
-	./update_vault_indexes.sh dnd/521
-	./patches.sh dnd/521/obsidian_vault apply
+	@./patches.sh dnd/521/markdown apply
+	@python update_vault.py dnd/521/markdown dnd/521/obsidian_vault
+	@./update_vault_indexes.sh dnd/521
+	@./patches.sh dnd/521/obsidian_vault apply
 
 vault-dnd521-zip: vault-dnd521
 	rsync -av dnd/521/obsidian_vault/ /tmp/dnd_521_srd/

dnd/51/markdown_patches/Conditions/Conditions.patch

@@ -5,18 +5,18 @@
 
  The following definitions specify what happens to a creature while it is subjected to a condition.
 +
-+- [[Blinded]]
-+- [[Charmed]]
-+- [[Deafened]]
-+- [[Exhaustion]]
-+- [[Frightened]]
-+- [[Grappled]]
-+- [[Incapacitated]]
-+- [[Invisible]]
-+- [[Paralyzed]]
-+- [[Petrified]]
-+- [[Poisoned]]
-+- [[Prone]]
-+- [[Restrained]]
-+- [[Stunned]]
-+- [[Unconscious]]
++- Blinded
++- Charmed
++- Deafened
++- Exhaustion
++- Frightened
++- Grappled
++- Incapacitated
++- Invisible
++- Paralyzed
++- Petrified
++- Poisoned
++- Prone
++- Restrained
++- Stunned
++- Unconscious

tests/ci/ci.bats

@@ -18,6 +18,7 @@
 
 @test "check for 5.1 vault changes" {
     expected_output=$(sed -e 's/^        //' <<'        EOF'
+        == Conditions/Conditions.md
         About the vault.md: no longer in source directory
         Magic Items/List of Magic Items by A-Z.md: no longer in source directory
         Magic Items/List of Magic Items by Rarity.md: no longer in source directory
@@ -29,9 +30,7 @@
         EOF
     )
 
-    run python update_vault.py \
-            dnd/51/markdown \
-            dnd/51/obsidian_vault
+    run make vault-dnd51
     diff -u <(echo "$expected_output") <(echo "$output")
     [ "$status" -eq 0 ]
 
@@ -67,9 +66,8 @@
         EOF
     )
 
-    run python update_vault.py \
-            dnd/521/markdown \
-            dnd/521/obsidian_vault
+
+    run make vault-dnd521
     diff -u <(echo "$expected_output") <(echo "$output")
     [ "$status" -eq 0 ]
 
@@ -78,7 +76,16 @@
 }
 
 @test "zero files changed" {
-    run git status --porcelain
-    diff -u <(echo "") <(echo "$output")
-    [ "$status" -eq 0 ]
+    status_output=$(git status --porcelain)
+    diff_output=$(git diff)
+
+    combined_output="$status_output"
+    if [ -n "$status_output" ]; then
+        combined_output="$status_output
+
+Diff:
+$diff_output"
+    fi
+
+    diff -u <(echo "") <(echo "$combined_output")
 }