5b808a6d45
Before the batch files could not run if the path to the directory had one or more spaces in it. EG: "C:/Desktop/Spigot Repo". Now works with the patch
35 lines
1 KiB
Bash
Executable file
35 lines
1 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
basedir=`pwd`
|
|
echo "Rebuilding patch files from current fork state..."
|
|
function cleanupPatches {
|
|
cd "$1"
|
|
for patch in *.patch; do
|
|
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|.index)")
|
|
|
|
testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver")
|
|
if [ "x$testver" != "x" ]; then
|
|
diffs=$(echo "$diffs" | head -n -2)
|
|
fi
|
|
|
|
|
|
if [ "x$diffs" == "x" ] ; then
|
|
git reset HEAD $patch >/dev/null
|
|
git checkout -- $patch >/dev/null
|
|
fi
|
|
done
|
|
}
|
|
function savePatches {
|
|
what=$1
|
|
target=$2
|
|
cd "$basedir/$target"
|
|
git format-patch --no-stat -N -o "$basedir/${what}-Patches/" upstream/upstream
|
|
cd "$basedir"
|
|
git add "$basedir/${what}-Patches"
|
|
cleanupPatches "$basedir/${what}-Patches"
|
|
echo " Patches saved for $what to $what-Patches/"
|
|
}
|
|
|
|
savePatches Bukkit Spigot-API
|
|
savePatches CraftBukkit Spigot-Server
|