bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Make sure we pop commits after git update

Browse Source
This commit is contained in:
Bryan Roessler
2025-07-11 19:28:17 -04:00
parent 9587308d84
commit 68c03ab186
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
installJRMC
View File

@@ -1715,28 +1715,25 @@ update() {
[[ "$(git -C "$SCRIPT_DIR" config --get remote.origin.url)" =~ installJRMC|installjrmc ]]; then [[ "$(git -C "$SCRIPT_DIR" config --get remote.origin.url)" =~ installJRMC|installjrmc ]]; then
# Get the current commit hash # 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) before_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD)
# Stash local changes before pull # Stash local changes before pull
execute git -C "$SCRIPT_DIR" stash push --quiet execute git -C "$SCRIPT_DIR" stash push --quiet
# Pull latest changes # Pull latest changes
debug "Running git pull in $SCRIPT_DIR" execute git -C "$SCRIPT_DIR" pull --quiet
if ! git -C "$SCRIPT_DIR" pull | grep -q "Already up to date"; then
# Get the new commit hash after pull # Restore local changes
after_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD) execute git -C "$SCRIPT_DIR" stash pop --quiet
# If the commit hash has changed, an update occurred # If the commit hash has changed, an update occurred
if [[ "$before_pull_hash" != "$after_pull_hash" ]]; then if [[ "$before_pull_hash" != $(git -C "$SCRIPT_DIR" rev-parse HEAD) ]]; then
echo "Detected installJRMC update, restarting" echo "Detected installJRMC update, restarting"
execute git -C "$SCRIPT_DIR" stash pop --quiet
exec "$SCRIPT_PATH" "$@" "--no-update" exec "$SCRIPT_PATH" "$@" "--no-update"
fi fi
fi
execute git -C "$SCRIPT_DIR" stash pop --quiet
else 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 local tmp
tmp=$(mktemp) || { err "Failed to create temporary file."; return 1; } tmp=$(mktemp) || { err "Failed to create temporary file."; return 1; }