From 7b20b9f89c034ec59a932b89bb3db5fb157f723e Mon Sep 17 00:00:00 2001
From: c0repwn3r <core@coredoes.dev>
Date: Wed, 24 May 2023 08:23:20 -0400
Subject: [PATCH] fixup patcher

---
 .../0001-pyblocks-basic-framework.patch                       | 0
 patches/{scratch-blocks => blocks}/0002-imu-blocks.patch      | 0
 patches/blocks/PATCHBASE                                      | 1 +
 pbt.sh                                                        | 4 ++--
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename patches/{scratch-blocks => blocks}/0001-pyblocks-basic-framework.patch (100%)
 rename patches/{scratch-blocks => blocks}/0002-imu-blocks.patch (100%)
 create mode 100644 patches/blocks/PATCHBASE

diff --git a/patches/scratch-blocks/0001-pyblocks-basic-framework.patch b/patches/blocks/0001-pyblocks-basic-framework.patch
similarity index 100%
rename from patches/scratch-blocks/0001-pyblocks-basic-framework.patch
rename to patches/blocks/0001-pyblocks-basic-framework.patch
diff --git a/patches/scratch-blocks/0002-imu-blocks.patch b/patches/blocks/0002-imu-blocks.patch
similarity index 100%
rename from patches/scratch-blocks/0002-imu-blocks.patch
rename to patches/blocks/0002-imu-blocks.patch
diff --git a/patches/blocks/PATCHBASE b/patches/blocks/PATCHBASE
new file mode 100644
index 0000000..fcb6b8e
--- /dev/null
+++ b/patches/blocks/PATCHBASE
@@ -0,0 +1 @@
+7807d68b593f5e482a4450581ba27d4d6d939003
diff --git a/pbt.sh b/pbt.sh
index aee3666..4dee98f 100755
--- a/pbt.sh
+++ b/pbt.sh
@@ -41,7 +41,7 @@ sub_clone() {
     job_success "scratch-blocks" "clone"
   fi
   job_start "scratch-blocks" "checkout"
-  pbase=$(<patches/scratch-blocks/PATCH-BASE)
+  pbase=$(cat patches/blocks/PATCHBASE | tr -d '\n')
   echo "Checking out scratch-blocks patchbase $pbase"
   cd scratch-blocks || exit
   git checkout "$pbase"
@@ -62,7 +62,7 @@ sub_patch() {
 
   git am --abort >/dev/null 2>&1
 
-  git am --3way "../patches/scratch-blocks/"*.patch
+  git am --3way "../patches/blocks/"*.patch
   if [ "$?" != "0" ]; then
     echo "One or more patches did not apply cleanly to scratch-blocks. Check above message and try again".
     job_fail "scratch-blocks" "patch"