Add updateUpstream.sh script to help with updating upstream (Waterfall).

Author: Justsnoopy30

hyperfall

@@ -19,6 +19,9 @@ case "$1" in
     "w" | "wiggle")
         scripts/wigglePatch.py
     ;;
+    "u" | "updateUpstream")
+        scripts/updateUpstream.sh
+    ;;
     *)
         echo "HyperFall build tool command. This provides a variety of commands to control the Travertine"
         echo "build. View below for details of the available commands."
@@ -31,5 +34,6 @@ case "$1" in
         echo "                     | The bootstrap artifact can be found in Travertine-Proxy/bootstrap/target/"
         echo "  * e, edit          | Runs git rebase -i for Waterfall, allowing patches to be easily modified"
         echo "  * w, wiggle        | Helps to apply patches that fail to using default Git."
+        echo "  * u, updateUpstream| Update Upstream (Waterfall)"
     ;;
 esac

scripts/updateUpstream.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+echo Merging upstream...
+./hyperfall m
+echo Merged upstream!
+read -rsp $'Press enter to continue...\n'
+echo Applying all the patches to Waterfall...
+./hyperfall p
+echo Applied all the patches to Waterfall!
+echo Check to see if there is any conflicts and fix them if there are by fixing it in HyperFall-Proxy and running git am --continue.
+read -rsp $'Press enter to continue...\n'
+echo Rebuilding the patches...
+./hyperfall rb
+echo Rebuilt the patches!
+read -rsp $'Press enter to continue...\n'