Paper/scripts/upstreamMerge.sh

41 lines
883 B
Bash
Raw Normal View History

2016-04-02 05:55:54 +02:00
#!/usr/bin/env bash
(
set -e
PS1="$"
basedir="$(cd "$1" && pwd -P)"
2016-04-02 05:55:54 +02:00
workdir="$basedir/work"
gitcmd="git -c commit.gpgsign=false"
updated="0"
function getRef {
git ls-tree $1 $2 | cut -d' ' -f3 | cut -f1
}
function update {
2016-04-02 05:55:54 +02:00
cd "$workdir/$1"
$gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master
refRemote=$(git rev-parse HEAD)
cd ../
$gitcmd add $1 -f
refHEAD=$(getRef HEAD "$workdir/$1")
echo "$1 $refHEAD - $refRemote"
if [ "$refHEAD" != "$refRemote" ]; then
export updated="1"
fi
}
update Bukkit
update CraftBukkit
update Spigot
2016-08-19 23:00:59 +02:00
2017-05-21 06:41:39 +02:00
if [[ "$2" = "all" || "$2" = "a" ]] ; then
2016-08-19 23:00:59 +02:00
update BuildData
update Paperclip
fi
if [ "$updated" == "1" ]; then
echo "Rebuilding patches without filtering to improve apply ability"
cd "$basedir"
scripts/rebuildPatches.sh "$basedir" nofilter 1>/dev/null|| exit 1
fi
)