testserver/scripts/upstreamMerge.sh

#!/usr/bin/env bash

(
set -e
PS1="$"
basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work"

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

update Bukkit
update CraftBukkit
update Spigot

if [[ "$2" = "all" ]] ; then
	update BuildData
	update Paperclip
fi
)
Cleanup and restructure the project 2016-04-02 03:55:54 +00:00			`#!/usr/bin/env bash`
Add upstreamMerge.sh and update CB submodule 2016-01-26 06:04:43 +00:00
Use `set -e` to handle errors better in the build scripts 2016-04-03 07:23:19 +00:00			`(`
			`set -e`
Add upstreamMerge.sh and update CB submodule 2016-01-26 06:04:43 +00:00			`PS1="$"`
Workaround for OSX not having the realpath command. 2016-04-03 08:35:51 +00:00			`basedir="$(cd "$1" && pwd -P)"`
Cleanup and restructure the project 2016-04-02 03:55:54 +00:00			`workdir="$basedir/work"`
Add upstreamMerge.sh and update CB submodule 2016-01-26 06:04:43 +00:00
			`function update {`
Cleanup and restructure the project 2016-04-02 03:55:54 +00:00			`cd "$workdir/$1"`
Add upstreamMerge.sh and update CB submodule 2016-01-26 06:04:43 +00:00			`git fetch && git reset --hard origin/master`
			`cd ../`
			`git add $1`
			`}`

			`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 17:32:05 +00:00			`update Spigot`
Add upstreamMerge script to paper tool 2016-08-19 21:00:59 +00:00
			`if [[ "$2" = "all" ]] ; then`
			`update BuildData`
			`update Paperclip`
			`fi`
Use `set -e` to handle errors better in the build scripts 2016-04-03 07:23:19 +00:00			`)`