From 2bf8ae32511dc55fa606e1599c1d3a1e4f34b403 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 19 Aug 2016 16:00:59 -0500
Subject: [PATCH] Add upstreamMerge script to paper tool

---
 paper                    | 4 ++++
 scripts/upstreamMerge.sh | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/paper b/paper
index 877ee0ec65..4d88796ee2 100755
--- a/paper
+++ b/paper
@@ -74,6 +74,9 @@ case "$1" in
     "td" | "testdir")
         cd "${PAPER_TEST_DIR:-$basedir/work/test-server}"
     ;;
+    "u" | "up" | "upstream")
+        scripts/upstreamMerge.sh "$basedir" "$2"
+    ;;
     "r" | "root")
         cd "$basedir"
     ;;
@@ -149,6 +152,7 @@ case "$1" in
         echo "  * p, patch          | Apply all patches to the project without building it. Can be run from anywhere."
         echo "  * j, jar            | Apply all patches and build the project, paperclip.jar will be output. Can be run from anywhere."
         echo "  * m, mcdev          | Setup decompiled sources for non-modified NMS files to be imported into an IDE. Can be run from anywhere."
+        echo "  * u, up, upstream   | Updates the submodules used by Paper to their latest upstream versions."
         echo "  * t, testserver     | Run the test server with the set of plugins Paper uses as a basis for server tests."
         echo ""
         echo " These commands require the setup command before use:"
diff --git a/scripts/upstreamMerge.sh b/scripts/upstreamMerge.sh
index 9b05f170e7..11dd71dea3 100755
--- a/scripts/upstreamMerge.sh
+++ b/scripts/upstreamMerge.sh
@@ -16,4 +16,9 @@ function update {
 update Bukkit
 update CraftBukkit
 update Spigot
+
+if [[ "$2" = "all" ]] ; then
+	update BuildData
+	update Paperclip
+fi
 )