core
/
pyblocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup patcher

This commit is contained in:
c0repwn3r 2023-05-24 08:23:20 -04:00
parent b7d6119058
commit 7b20b9f89c
Signed by: core
GPG Key ID: FDBF740DADDCEECF
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
patches/scratch-blocks/0001-pyblocks-basic-framework.patch → patches/blocks/0001-pyblocks-basic-framework.patch
View File

0
patches/scratch-blocks/0002-imu-blocks.patch → patches/blocks/0002-imu-blocks.patch
View File

1
patches/blocks/PATCHBASE Normal file
View File

@ -0,0 +1 @@
7807d68b593f5e482a4450581ba27d4d6d939003

4
pbt.sh
View File

@ -41,7 +41,7 @@ sub_clone() {
job_success "scratch-blocks" "clone" job_success "scratch-blocks" "clone"
fi fi
job_start "scratch-blocks" "checkout" 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" echo "Checking out scratch-blocks patchbase $pbase"
cd scratch-blocks || exit cd scratch-blocks || exit
git checkout "$pbase" git checkout "$pbase"
@ -62,7 +62,7 @@ sub_patch() {
git am --abort >/dev/null 2>&1 git am --abort >/dev/null 2>&1
git am --3way "../patches/scratch-blocks/"*.patch git am --3way "../patches/blocks/"*.patch
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo "One or more patches did not apply cleanly to scratch-blocks. Check above message and try again". echo "One or more patches did not apply cleanly to scratch-blocks. Check above message and try again".
job_fail "scratch-blocks" "patch" job_fail "scratch-blocks" "patch"