From bb2b91c11c085b20bd3935c21279edc6719f53af Mon Sep 17 00:00:00 2001
From: Jordan Atwood <nightfirecat@nightfirec.at>
Date: Mon, 15 Jan 2024 19:44:00 -0800
Subject: [PATCH] Reset dev branch to appropriate upstream and branch

---
 src/.bin/open-runelite.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/.bin/open-runelite.sh b/src/.bin/open-runelite.sh
index 1b5859b..019432d 100755
--- a/src/.bin/open-runelite.sh
+++ b/src/.bin/open-runelite.sh
@@ -50,8 +50,8 @@ DIR="$(dirname "${BASH_SOURCE[0]}")"
 RUNELITE_TARGET_COMMIT_FILENAME="$DIR/commit"
 function build_client {
 	# Update local dev branch and build
-	git checkout dev || git checkout -b dev upstream/master
-	git reset --hard upstream/master
+	git checkout dev || git checkout -b dev
+	git reset --hard "$UPSTREAM_REMOTE/$UPSTREAM_BRANCH"
 	git merge --no-gpg-sign --no-edit "${BRANCHES_TO_MERGE[@]}" || exit 1
 	mvn clean package -DskipTests -U || exit 1
 	git checkout -