CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add sexier applyPatches and rebuildPatches scripts"

Browse Source 
THE TIME JUST WASN'T RIGHT
This reverts commit 0dd18185d8.
This commit is contained in:
Zach Brown 2016-01-04 04:48:00 -06:00
parent 0dd18185d8
commit e489049520
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
applyPatches.sh
View File

@ -10,21 +10,23 @@ function applyPatch {
branch=$3 branch=$3
cd "$basedir/$what" cd "$basedir/$what"
git fetch git fetch
git branch -f upstream "$branch" >/dev/null git reset --hard "$branch"
git branch -f upstream >/dev/null
cd "$basedir" cd "$basedir"
if [ ! -d "$basedir/$target" ]; then if [ ! -d "$basedir/$target" ]; then
git clone "$what" "$target" git clone $1 $target -b upstream
fi fi
cd "$basedir/$target" cd "$basedir/$target"
echo "Resetting $target to $what..." echo "Resetting $target to $what..."
git remote add -f upstream ../$what >/dev/null 2>&1 git remote rm upstream 2>/dev/null 2>&1
git remote add upstream ../$what >/dev/null 2>&1
git checkout master >/dev/null 2>&1 git checkout master >/dev/null 2>&1
git fetch upstream >/dev/null 2>&1 git fetch upstream >/dev/null 2>&1
git reset --hard upstream/upstream git reset --hard upstream/upstream
echo " Applying patches to $target..." echo " Applying patches to $target..."
git am --abort >/dev/null 2>&1 git am --abort
git am --3way --ignore-whitespace "$basedir/${what}-Patches/"*.patch git am --3way "$basedir/${what}-Patches/"*.patch
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo " Something did not apply cleanly to $target." echo " Something did not apply cleanly to $target."
echo " Please review above details and finish the apply then" echo " Please review above details and finish the apply then"
@ -35,5 +37,14 @@ function applyPatch {
fi fi
} }
applyPatch Bukkit Spigot-API HEAD && applyPatch CraftBukkit Spigot-Server patched echo
applyPatch Spigot-API PaperSpigot-API HEAD && applyPatch Spigot-Server PaperSpigot-Server HEAD echo "Applying SpigotMC patches to CraftBukkit and Bukkit"
echo
cd ../Bukkit
hash=$(git rev-parse HEAD)
git branch -f spigot "$hash"
applyPatch Bukkit Spigot-API origin/spigot && applyPatch CraftBukkit Spigot-Server origin/patched
echo
echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API"
echo
applyPatch Spigot-API PaperSpigot-API && applyPatch Spigot-Server PaperSpigot-Server

23
rebuildPatches.sh
View File

@ -3,20 +3,24 @@
PS1="$" PS1="$"
basedir=`pwd` basedir=`pwd`
echo "Rebuilding patch files from current fork state..." echo "Rebuilding patch files from current fork state..."
git config core.safecrlf false
function cleanupPatches { function cleanupPatches {
cd "$1" cd "$1"
for patch in *.patch; do for patch in *.patch; do
echo "$patch"
gitver=$(tail -n 2 $patch | grep -ve "^$" | tail -n 1) gitver=$(tail -n 2 $patch | grep -ve "^$" | tail -n 1)
diffs=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|Date\: |.index)") diffs=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)")
testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver") testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver")
if [ "x$testver" != "x" ]; then if [ "x$testver" != "x" ]; then
diffs=$(echo "$diffs" | sed 'N;$!P;$!D;$d') mingw=$(uname -s | grep "MINGW")
if [ "x$mingw" != "x" ]; then
diffs=$(echo "$diffs" | head -n $(($(echo "$diffs" | wc -l | sed -r 's/^ +//' | cut -d ' ' -f 1) - 2)))
else
diffs=$(echo "$diffs" | head -n -2)
fi
fi fi
if [ "x$diffs" == "x" ] ; then if [ "x$diffs" == "x" ] ; then
git reset HEAD $patch >/dev/null git reset HEAD $patch >/dev/null
git checkout -- $patch >/dev/null git checkout -- $patch >/dev/null
@ -27,16 +31,15 @@ function cleanupPatches {
function savePatches { function savePatches {
what=$1 what=$1
target=$2 target=$2
echo "Formatting patches for $what..."
cd "$basedir/$target" cd "$basedir/$target"
git format-patch --no-stat -N -o "$basedir/${what}-Patches/" upstream/upstream >/dev/null git format-patch --no-stat -N -o "$basedir/${what}-Patches/" upstream/upstream
cd "$basedir" cd "$basedir"
git add -A "$basedir/${what}-Patches" git add "$basedir/${what}-Patches"
cleanupPatches "$basedir/${what}-Patches" cleanupPatches "$basedir/${what}-Patches"
echo " Patches saved for $what to $what-Patches/" echo " Patches saved for $what to $what-Patches/"
} }
if [ "$1" == "clean" ]; then
rm -rf Spigot-*-Patches #savePatches Bukkit Spigot-API
fi #savePatches CraftBukkit Spigot-Server
savePatches Spigot-API PaperSpigot-API savePatches Spigot-API PaperSpigot-API
savePatches Spigot-Server PaperSpigot-Server savePatches Spigot-Server PaperSpigot-Server