fix exit codes and update to 1.19.4

Author: mastercoms

glowkit.sh

@@ -29,22 +29,22 @@ gitcmd="git -c commit.gpgsign=false"
 
 source "$basedir/scripts/functions.sh"
 
-"$basedir"/scripts/requireDeps.sh || exit 1
+"$basedir"/scripts/requireDeps.sh || exit $?
 
 failed=0
 case "$1" in
     "u" | "up" | "upstream")
     (
         cd "$basedir"
         scripts/upstreamMerge.sh "$basedir" "$2"
-    )
+    ) || exit $?
     ;;
     "cu" | "commitup" | "commitupstream" | "upc" | "upcommit" | "upstreamcommit")
     (
         cd "$basedir"
         shift
         scripts/upstreamCommit.sh "$@"
-    )
+    ) || exit $?
     ;;
     "r" | "root")
         cd "$basedir"

gradle.properties

@@ -1,6 +1,6 @@
 group=net.glowstone
-version=1.19.3-R0.1-SNAPSHOT
-mcVersion=1.19.3
+version=1.19.4-R0.1-SNAPSHOT
+mcVersion=1.19.4
 
 org.gradle.caching=true
 org.gradle.parallel=true

scripts/checkoutpr.sh

@@ -21,7 +21,7 @@ echo
 if [[ "$REPLY" =~ ^[Mm]$ ]]; then
 	git merge origin/$prevbranch
 elif [[ "$REPLY" =~ ^[Rr]$ ]]; then
-	git rebase master
+	git rebase main
 fi
 echo "Dropping to new shell, exit to delete the refs"
 "${SHELL:-bash}" -i

scripts/upstreamCommit.sh

@@ -24,4 +24,4 @@ log="${UP_LOG_PREFIX}Updated Upstream ($updated)\n\n${logsuffix}"
 
 echo -e "$log" | git commit -F -
 
-) || exit 1
+) || exit $?

scripts/upstreamMerge.sh

@@ -13,7 +13,7 @@ function getRef {
 }
 function update {
     cd "$workdir/$1"
-    $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard $2
+    ($gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/$2 --) || exit $?
     refRemote=$(git rev-parse HEAD)
     cd ../
     $gitcmd add --force $1
@@ -24,14 +24,14 @@ function update {
     fi
 }
 
-#update Paper origin/master
-update Paper "1.19.3"
+#update Paper master
+update Paper ver/1.19.4
 
 if [ "$updated" == "1" ]; then
     cd "$basedir"
-    ./gradlew cleanCache || exit 1 # todo: Figure out why this is necessary
-    ./gradlew applyApiPatches -Dpaperweight.debug=true || exit 1
-    ./gradlew rebuildApiPatches || exit 1
+    ./gradlew cleanCache || exit $?
+    ./gradlew applyApiPatches -Dpaperweight.debug=true || exit $?
+    ./gradlew rebuildApiPatches || exit $?
     $gitcmd add --force "Paper-API-Patches"
 fi
-) || exit 1
+) || exit $?