Paper/scripts/upstreamMerge.sh

#!/usr/bin/env bash

(
set -e
PS1="$"
basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work"
gitcmd="git -c commit.gpgsign=false"

function update {
    cd "$workdir/$1"
    $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master
    cd ../
    $gitcmd add $1
}

update Bukkit
update CraftBukkit
update Spigot

if [[ "$2" = "all" || "$2" = "a" ]] ; then
	update BuildData
	update Paperclip
fi
)
Cleanup and restructure the project 2016-04-02 05:55:54 +02:00			`#!/usr/bin/env bash`
Add upstreamMerge.sh and update CB submodule 2016-01-26 07:04:43 +01:00
Use `set -e` to handle errors better in the build scripts 2016-04-03 09:23:19 +02:00			`(`
			`set -e`
Add upstreamMerge.sh and update CB submodule 2016-01-26 07:04:43 +01:00			`PS1="$"`
Workaround for OSX not having the realpath command. 2016-04-03 10:35:51 +02:00			`basedir="$(cd "$1" && pwd -P)"`
Cleanup and restructure the project 2016-04-02 05:55:54 +02:00			`workdir="$basedir/work"`
Handle gpg signing better (#1123) Instead of checking whether it was set previously, setting it to false, then setting it back to true if it was true before, just use the command-line argument in git to override the config for that command. Using a variable makes it pretty painless to do. 2018-05-24 20:41:50 +02:00			`gitcmd="git -c commit.gpgsign=false"`
Add upstreamMerge.sh and update CB submodule 2016-01-26 07:04:43 +01:00
			`function update {`
Cleanup and restructure the project 2016-04-02 05:55:54 +02:00			`cd "$workdir/$1"`
Clean upstream before merging to ensure clean state 2019-04-03 03:46:32 +02:00			`$gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master`
Add upstreamMerge.sh and update CB submodule 2016-01-26 07:04:43 +01:00			`cd ../`
Handle gpg signing better (#1123) Instead of checking whether it was set previously, setting it to false, then setting it back to true if it was true before, just use the command-line argument in git to override the config for that command. Using a variable makes it pretty painless to do. 2018-05-24 20:41:50 +02:00			`$gitcmd add $1`
Add upstreamMerge.sh and update CB submodule 2016-01-26 07:04:43 +01:00			`}`

			`update Bukkit`
			`update CraftBukkit`
Update upstream Spigot and upstreamMerge script Also remove paperclip from upstream merge, it shouldn't need merging very often 2016-03-21 18:32:05 +01:00			`update Spigot`
Add upstreamMerge script to paper tool 2016-08-19 23:00:59 +02:00
Update Paper to MC 1.12-pre5 2017-05-21 06:41:39 +02:00			`if [[ "$2" = "all" \|\| "$2" = "a" ]] ; then`
Add upstreamMerge script to paper tool 2016-08-19 23:00:59 +02:00			`update BuildData`
			`update Paperclip`
			`fi`
Use `set -e` to handle errors better in the build scripts 2016-04-03 09:23:19 +02:00			`)`