Paper/upstreamMerge.sh

#!/bin/bash
basedir=`pwd`
function update {
    cd "$basedir/$1"
    git fetch && git reset --hard origin/master
    cd ../
    git add $1
}
update Bukkit
update CraftBukkit
Initial commit - hello future of Spigot! 2013-01-15 01:18:40 +00:00			`#!/bin/bash`
Switch to pwd so the scripts can work more reliably on other OSs 2013-01-21 09:24:30 +00:00			basedir=`pwd`
Initial commit - hello future of Spigot! 2013-01-15 01:18:40 +00:00			`function update {`
Batch files now work in directories with spaces in it Before the batch files could not run if the path to the directory had one or more spaces in it. EG: "C:/Desktop/Spigot Repo". Now works with the patch 2013-11-06 00:26:20 +00:00			`cd "$basedir/$1"`
Initial commit - hello future of Spigot! 2013-01-15 01:18:40 +00:00			`git fetch && git reset --hard origin/master`
			`cd ../`
			`git add $1`
			`}`
			`update Bukkit`
			`update CraftBukkit`