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"
|
2018-05-24 18:41:50 +00:00
|
|
|
gitcmd="git -c commit.gpgsign=false"
|
|
|
|
applycmd="$gitcmd am --3way --ignore-whitespace"
|
2018-05-17 01:41:10 +00:00
|
|
|
# Windows detection to workaround ARG_MAX limitation
|
|
|
|
windows="$([[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]] && echo "true" || echo "false")"
|
|
|
|
|
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"
|
2018-05-24 18:41:50 +00:00
|
|
|
$gitcmd fetch
|
|
|
|
$gitcmd 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
|
2018-05-24 18:41:50 +00:00
|
|
|
$gitcmd clone "$what" "$target"
|
2013-01-15 01:18:40 +00:00
|
|
|
fi
|
|
|
|
cd "$basedir/$target"
|
2016-04-14 03:39:54 +00:00
|
|
|
|
2016-03-21 17:22:47 +00:00
|
|
|
echo "Resetting $target to $what_name..."
|
2018-05-24 18:41:50 +00:00
|
|
|
$gitcmd remote rm upstream > /dev/null 2>&1
|
|
|
|
$gitcmd remote add upstream "$basedir/$what" >/dev/null 2>&1
|
|
|
|
$gitcmd checkout master 2>/dev/null || $gitcmd checkout -b master
|
|
|
|
$gitcmd fetch upstream >/dev/null 2>&1
|
|
|
|
$gitcmd reset --hard upstream/upstream
|
2016-04-14 03:39:54 +00:00
|
|
|
|
2013-01-15 01:18:40 +00:00
|
|
|
echo " Applying patches to $target..."
|
2016-04-14 03:39:54 +00:00
|
|
|
|
2018-05-24 18:41:50 +00:00
|
|
|
$gitcmd am --abort >/dev/null 2>&1
|
2018-07-14 01:44:35 +00:00
|
|
|
#TODO: remove
|
|
|
|
if [ "$what_name" == "Bukkit" ]; then
|
|
|
|
what_name="../../pre/Bukkit";
|
|
|
|
fi
|
2018-05-17 01:41:10 +00:00
|
|
|
# Special case Windows handling because of ARG_MAX constraint
|
|
|
|
if [[ $windows == "true" ]]; then
|
|
|
|
echo " Using workaround for Windows ARG_MAX constraint"
|
|
|
|
find "$basedir/${what_name}-Patches/"*.patch -print0 | xargs -0 $applycmd
|
|
|
|
else
|
|
|
|
$applycmd "$basedir/${what_name}-Patches/"*.patch
|
|
|
|
fi
|
|
|
|
|
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"
|
2018-05-17 01:41:10 +00:00
|
|
|
|
|
|
|
# On Windows, finishing the patch apply will only fix the latest patch
|
|
|
|
# users will need to rebuild from that point and then re-run the patch
|
|
|
|
# process to continue
|
|
|
|
if [[ $windows == "true" ]]; then
|
|
|
|
echo ""
|
|
|
|
echo " Because you're on Windows you'll need to finish the AM,"
|
|
|
|
echo " rebuild all patches, and then re-run the patch apply again."
|
|
|
|
echo " Consider using the scripts with Windows Subsystem for Linux."
|
|
|
|
fi
|
|
|
|
|
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-03-21 17:22:47 +00:00
|
|
|
# Move into spigot dir
|
2016-04-02 03:55:54 +00:00
|
|
|
cd "$workdir/Spigot"
|
2018-07-14 01:44:35 +00:00
|
|
|
|
2016-04-02 03:55:54 +00:00
|
|
|
basedir=$(pwd)
|
2016-03-21 17:22:47 +00:00
|
|
|
# Apply Spigot
|
2016-03-25 00:39:20 +00:00
|
|
|
(
|
2018-07-14 01:44:35 +00:00
|
|
|
#TODO: remove ../pre/ and reset to HEAD
|
|
|
|
applyPatch ../Bukkit Spigot-API origin/preview # &&
|
|
|
|
#applyPatch ../CraftBukkit Spigot-Server patched
|
2016-03-25 00:39:20 +00:00
|
|
|
) || (
|
2018-05-24 18:41:50 +00:00
|
|
|
echo "Failed to apply Spigot Patches"
|
|
|
|
exit 1
|
2016-03-25 00:39:20 +00:00
|
|
|
) || 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"
|
|
|
|
|
2018-07-14 01:44:35 +00:00
|
|
|
# TODO: Remove comment
|
|
|
|
# ./scripts/importmcdev.sh "$basedir" >/dev/null 2>&1
|
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
|
|
|
(
|
2018-07-14 01:44:35 +00:00
|
|
|
#TODO remove comment
|
|
|
|
applyPatch "work/Spigot/Spigot-API" Paper-API HEAD # &&
|
|
|
|
# applyPatch "work/Spigot/Spigot-Server" Paper-Server HEAD
|
2016-03-25 00:39:20 +00:00
|
|
|
) || (
|
2018-05-24 18:41:50 +00:00
|
|
|
echo "Failed to apply Paper Patches"
|
|
|
|
exit 1
|
2016-03-25 00:39:20 +00:00
|
|
|
) || exit 1
|
2016-04-03 07:23:19 +00:00
|
|
|
)
|