2016-04-02 03:55:54 +00:00
|
|
|
#!/usr/bin/env bash
|
2013-01-15 01:18:40 +00:00
|
|
|
|
2016-04-03 07:23:19 +00:00
|
|
|
(
|
2014-04-14 11:01:27 +00:00
|
|
|
PS1="$"
|
2016-04-03 08:35:51 +00:00
|
|
|
basedir="$(cd "$1" && pwd -P)"
|
2016-04-02 03:55:54 +00:00
|
|
|
workdir="$basedir/work"
|
2016-04-07 06:36:23 +00:00
|
|
|
gpgsign=$(git config commit.gpgsign)
|
2013-01-15 01:18:40 +00:00
|
|
|
echo "Rebuilding Forked projects.... "
|
|
|
|
|
|
|
|
function applyPatch {
|
|
|
|
what=$1
|
2016-04-02 03:55:54 +00:00
|
|
|
what_name=$(basename "$what")
|
2013-01-15 01:18:40 +00:00
|
|
|
target=$2
|
2014-12-02 06:02:15 +00:00
|
|
|
branch=$3
|
2016-03-25 04:11:38 +00:00
|
|
|
|
2013-11-06 00:26:20 +00:00
|
|
|
cd "$basedir/$what"
|
2014-11-28 01:17:45 +00:00
|
|
|
git fetch
|
2016-02-29 23:09:49 +00:00
|
|
|
git branch -f upstream "$branch" >/dev/null
|
2013-01-19 19:04:56 +00:00
|
|
|
|
2013-11-06 00:26:20 +00:00
|
|
|
cd "$basedir"
|
2013-01-15 01:18:40 +00:00
|
|
|
if [ ! -d "$basedir/$target" ]; then
|
2016-02-29 23:09:49 +00:00
|
|
|
git clone "$what" "$target"
|
2013-01-15 01:18:40 +00:00
|
|
|
fi
|
|
|
|
cd "$basedir/$target"
|
2016-03-21 17:22:47 +00:00
|
|
|
echo "Resetting $target to $what_name..."
|
2016-03-25 04:11:38 +00:00
|
|
|
git remote rm upstream > /dev/null 2>&1
|
2016-04-02 03:55:54 +00:00
|
|
|
git remote add upstream "$basedir/$what" >/dev/null 2>&1
|
2016-03-25 04:11:38 +00:00
|
|
|
git checkout master 2>/dev/null || git checkout -b master
|
2013-01-19 19:04:56 +00:00
|
|
|
git fetch upstream >/dev/null 2>&1
|
|
|
|
git reset --hard upstream/upstream
|
2013-01-15 01:18:40 +00:00
|
|
|
echo " Applying patches to $target..."
|
2016-02-29 23:09:49 +00:00
|
|
|
git am --abort >/dev/null 2>&1
|
2016-03-21 17:22:47 +00:00
|
|
|
git am --3way --ignore-whitespace "$basedir/${what_name}-Patches/"*.patch
|
2013-01-15 01:18:40 +00:00
|
|
|
if [ "$?" != "0" ]; then
|
|
|
|
echo " Something did not apply cleanly to $target."
|
|
|
|
echo " Please review above details and finish the apply then"
|
|
|
|
echo " save the changes with rebuildPatches.sh"
|
2013-01-19 08:18:20 +00:00
|
|
|
exit 1
|
2013-01-15 01:18:40 +00:00
|
|
|
else
|
|
|
|
echo " Patches applied cleanly to $target"
|
|
|
|
fi
|
|
|
|
}
|
2014-11-28 01:17:45 +00:00
|
|
|
|
2016-04-07 06:36:23 +00:00
|
|
|
function enableCommitSigningIfNeeded {
|
|
|
|
if [[ "$gpgsign" == "true" ]]; then
|
|
|
|
git config --global commit.gpgsign true
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
# Disable GPG signing before AM, slows things down and doesn't play nicely.
|
|
|
|
# There is also zero rational or logical reason to do so for these sub-repo AMs.
|
|
|
|
# Calm down kids, it's re-enabled (if needed) immediately after, pass or fail.
|
|
|
|
if [[ "$gpgsign" == "true" ]]; then
|
2016-04-07 06:39:54 +00:00
|
|
|
# Yes, this has to be global
|
2016-04-07 06:36:23 +00:00
|
|
|
git config --global commit.gpgsign false
|
|
|
|
fi
|
|
|
|
|
2016-03-21 17:22:47 +00:00
|
|
|
# Move into spigot dir
|
2016-04-02 03:55:54 +00:00
|
|
|
cd "$workdir/Spigot"
|
|
|
|
basedir=$(pwd)
|
2016-03-21 17:22:47 +00:00
|
|
|
# Apply Spigot
|
2016-03-25 00:39:20 +00:00
|
|
|
(
|
|
|
|
applyPatch ../Bukkit Spigot-API HEAD &&
|
|
|
|
applyPatch ../CraftBukkit Spigot-Server patched
|
|
|
|
) || (
|
|
|
|
echo "Failed to apply Spigot Patches"
|
2016-04-07 06:36:23 +00:00
|
|
|
enableCommitSigningIfNeeded
|
2016-03-25 00:39:20 +00:00
|
|
|
exit 1
|
|
|
|
) || exit 1
|
2016-03-21 17:22:47 +00:00
|
|
|
# Move out of Spigot
|
2016-04-02 03:55:54 +00:00
|
|
|
basedir="$1"
|
|
|
|
cd "$basedir"
|
2016-03-21 17:22:47 +00:00
|
|
|
|
2016-03-31 00:50:23 +00:00
|
|
|
echo "Importing MC Dev"
|
|
|
|
|
2016-04-02 03:55:54 +00:00
|
|
|
./scripts/importmcdev.sh "$basedir"
|
2016-03-31 00:50:23 +00:00
|
|
|
|
2016-03-21 17:22:47 +00:00
|
|
|
# Apply paper
|
2016-04-02 03:55:54 +00:00
|
|
|
cd "$basedir"
|
2016-03-25 00:39:20 +00:00
|
|
|
(
|
2016-04-02 03:55:54 +00:00
|
|
|
applyPatch "work/Spigot/Spigot-API" Paper-API HEAD &&
|
|
|
|
applyPatch "work/Spigot/Spigot-Server" Paper-Server HEAD
|
2016-04-07 06:36:23 +00:00
|
|
|
enableCommitSigningIfNeeded
|
2016-03-25 00:39:20 +00:00
|
|
|
) || (
|
|
|
|
echo "Failed to apply Paper Patches"
|
2016-04-07 06:36:23 +00:00
|
|
|
enableCommitSigningIfNeeded
|
2016-03-25 00:39:20 +00:00
|
|
|
exit 1
|
|
|
|
) || exit 1
|
2016-04-03 07:23:19 +00:00
|
|
|
)
|