fixup patcher

patches/blocks/PATCHBASE

@@ -0,0 +1 @@
+7807d68b593f5e482a4450581ba27d4d6d939003

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"