From 68c03ab18619d36f4cd7f8b9d8698bccc76afd72 Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Fri, 11 Jul 2025 19:28:17 -0400
Subject: [PATCH] Make sure we pop commits after git update

---
 installJRMC | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/installJRMC b/installJRMC
index 31276bb..7a63f32 100755
--- a/installJRMC
+++ b/installJRMC
@@ -1715,28 +1715,25 @@ update() {
   [[ "$(git -C "$SCRIPT_DIR" config --get remote.origin.url)" =~ installJRMC|installjrmc ]]; then
 
     # Get the current commit hash
-    local before_pull_hash after_pull_hash
+    local before_pull_hash
     before_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD)
 
     # Stash local changes before pull
     execute git -C "$SCRIPT_DIR" stash push --quiet
     
     # Pull latest changes
-    debug "Running git pull in $SCRIPT_DIR"
-    if ! git -C "$SCRIPT_DIR" pull | grep -q "Already up to date"; then
-      # Get the new commit hash after pull
-      after_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD)
+    execute git -C "$SCRIPT_DIR" pull --quiet
 
-      # If the commit hash has changed, an update occurred
-      if [[ "$before_pull_hash" != "$after_pull_hash" ]]; then
-        echo "Detected installJRMC update, restarting"
-        execute git -C "$SCRIPT_DIR" stash pop --quiet
-        exec "$SCRIPT_PATH" "$@" "--no-update"
-      fi
-    fi
+    # Restore local changes
     execute git -C "$SCRIPT_DIR" stash pop --quiet
+
+    # If the commit hash has changed, an update occurred
+    if [[ "$before_pull_hash" != $(git -C "$SCRIPT_DIR" rev-parse HEAD) ]]; then
+      echo "Detected installJRMC update, restarting"
+      exec "$SCRIPT_PATH" "$@" "--no-update"
+    fi
   else
-    debug "Not in a git repository or not the installJRMC repository. Checking for updates via download."
+    debug "Not in the installJRMC repository, checking for installJRMC update via webscrape."
 
     local tmp
     tmp=$(mktemp) || { err "Failed to create temporary file."; return 1; }