From dc245da7535680560871990543e5aac352e5f121 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Fri, 1 Mar 2024 12:39:26 -0500
Subject: [PATCH] ref(pre-receive): Use bids-hook-v2

---
 services/datalad/hooks/pre-receive | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/services/datalad/hooks/pre-receive b/services/datalad/hooks/pre-receive
index 9b6a25e16..8ca102f45 100755
--- a/services/datalad/hooks/pre-receive
+++ b/services/datalad/hooks/pre-receive
@@ -129,19 +129,15 @@ function main() {
       bidsignore=""
     fi
 
-    # For raw datasets, do not include dataset_description
-    # For derivative datasets, include with 0000 separator
-    # Once the shift to the schema validator is complete, this distinction can go away.
-    local dataset_description=$(git show "${newref}:dataset_description.json")
-    if [ -n "$(echo ${dataset_description} | grep DatasetType.*derivative )" ]; then
-      dataset_description="$dataset_description\n0000\n"
-    else
-      dataset_description=""
-    fi
+    # Run validation with bidsschematools
+    python -m bidsschematools pre-receive-hook <<END
+bids-hook-v2
+$( git show "${newref}:dataset_description.json" | tr -d '\r\n' )
+${bidsignore}
+0001
+$( git ls-tree --name-only -r "${newref}" )
+END
 
-    # Run validation (with .bidsignore if we found it above)
-    { echo "${dataset_description}${bidsignore}" && echo "0001" && git ls-tree --name-only -r "${newref}"; } | \
-      /usr/local/bin/bst pre-receive-hook
     if [[ "$?" != 0 ]]; then
       echo ""
       echo "-------------------------------------------------------------------------"