Yatopia/scripts/resetToUpstream.sh

42 lines
1.4 KiB
Bash
Raw Normal View History

[WIP] Better Patch System (#18) * Update build.yml * Remove 3rd party patches * Add Upsteam Submodules * Fix patches * ? * Fix patches * Add Fast Init script * Lots of stuff also it's broke * more broken * fixes * mor stuff * gfhfgh hg * fix patch * fix up script * update submodule * add papercut * update tuinity * update gitmodules * fix var name * fix more var stuff * some how it's not deleting shit anymore * should now use the branch it just made why are we doing this again? * now it does thing thing * return previous so YAPFA can use it * ok now it really does the thing * for REAL it does the thing * don't do the thing because it causes too many problems * fix api * work * use better patching for YAPFA patches * fix better patching * more fixes * new patches stuff * remove old 3rd parry patches add removed akarin patches * make new branch for making patches * hopefully build patches correctly * fix gitignore and add config patches * remove papercut files * fix some weirdness * fix bug * time to do some fixin' :eyes: * New Patch System Rebased Patches * fix full build * exit 1 * fix * Remove patch * Hopefully fix compile errors * fixes * this might work * don't use rej for our patches * tmp disable cache * some times case sensitivity is dumb * my sanity is at an all time low :) * dfg * readd cahce * fix? * Update Upstream * fix perms * fix * fix api * Redo API * rm folders * fix villager brain patch * emc explosion pref * fixed aikar's shit * betterfix * fix lagggg * Origami * Origami Fixes * Update readme * test async path finding * WIP Async Path Finding * WIP fix async path finding * same as bellow * same * update to newer funcs * fix newer funcs * fix author * Updates, Fixes, and new patches * fixes * possibly async flying path finding * minor asnyc pathfinding fix * test remove non asnyc path finder * WIP make all path finding async * Rename everything * Exec flag * Rebuild hashes * remove dupe patch * fix? * Fix packages, redirect config * old nav class is now async and back * add getchatcolor.getbyid and handle patches with a . in them better Co-authored-by: tr7zw <tr7zw@live.de> Co-authored-by: Unknown <unknown@example.com> Co-authored-by: Ovydux <68059159+Ovydux@users.noreply.github.com>
2020-08-03 18:48:42 +02:00
#!/usr/bin/env bash
searchtxts=(Server API)
basedir=$1
basename=$(basename $baseproject)
branch=HEAD
for type in ${searchtxts[@]}; do
baseproject=Tuinity/Tuinity-$type
target=Yatopia-$type
echo "$baseproject, $target, $branch, $basedir, $type, $basename"
echo "Setup upstream project.."
echo "$basedir/$baseproject"
cd "$basedir/$baseproject"
git fetch --all &> /dev/null
# Create the upstream branch in Paper project with current state
git checkout master >/dev/null 2>&1 # possibly already in
git branch -D upstream &> /dev/null
git branch -f upstream "$branch" &> /dev/null && git checkout upstream &> /dev/null
cd $basedir
# Create source project dirs
if [ ! -d "$basedir/$target" ]; then
mkdir "$basedir/$target"
cd "$basedir/$target"
# git remote add origin "$5"
fi
echo "$basedir/$target"
cd "$basedir/$target"
git init > /dev/null 2>&1
echo " "
echo "Reset $target to $basename.."
# Add the generated Paper project as the upstream remote of subproject
git remote rm upstream &> /dev/null
git remote add upstream "$basedir/$baseproject" &> /dev/null
# Ensure that we are in the branch we want so not overriding things
git checkout master &> /dev/null || git checkout -b master &> /dev/null
git fetch upstream &> /dev/null
# Reset our source project to Paper
cd "$basedir/$target" && git reset --hard upstream/upstream &> /dev/null
done