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

Git stash pop local changes after update

Browse Source
This commit is contained in:
Bryan Roessler
2025-02-22 15:17:27 -05:00
parent 2fbc329f1e
commit c629846c8e
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
installJRMC
View File

@@ -1587,33 +1587,28 @@ update() {
# Check if we're in a git directory and if it's the installJRMC repository # Check if we're in a git directory and if it's the installJRMC repository
if git -C "$SCRIPT_DIR" rev-parse --is-inside-work-tree &>/dev/null \ if git -C "$SCRIPT_DIR" rev-parse --is-inside-work-tree &>/dev/null \
&& [[ "$(git -C "$SCRIPT_DIR" config --get remote.origin.url)" == *"installJRMC"* ]]; then && [[ "$(git -C "$SCRIPT_DIR" config --get remote.origin.url)" == *"installJRMC"* ]]; then
debug "installJRMC git repository detected. Running git pull"
# Get the current commit hash # Get the current commit hash
local before_pull_hash after_pull_hash local before_pull_hash after_pull_hash
before_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD) before_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD)
# Stash any local changes # Stash local changes before pull
execute git -C "$SCRIPT_DIR" stash --quiet execute git -C "$SCRIPT_DIR" stash --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)
# Pull the latest changes # If the commit hash has changed, an update occurred
debug "Executing git pull in $SCRIPT_DIR" if [[ "$before_pull_hash" != "$after_pull_hash" ]]; then
if git -C "$SCRIPT_DIR" pull | grep -q "Already up to date"; then echo "Detected installJRMC update, restarting"
debug "No updates found in git repository." execute git -C "$SCRIPT_DIR" stash pop
return 0 exec "$SCRIPT_PATH" "$@" "--no-update"
fi fi
# Get the new commit hash after pull
after_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD)
# If the commit hash has changed, an update occurred
if [[ "$before_pull_hash" != "$after_pull_hash" ]]; then
echo "Detected installJRMC update, restarting"
exec "$SCRIPT_PATH" "$@" "--no-update"
else
debug "Git pull did not change the commit hash. No update applied."
return 0
fi fi
execute git -C "$SCRIPT_DIR" stash pop
else else
debug "Not in a git repository or not the installJRMC repository. Checking for updates via download." debug "Not in a git repository or not the installJRMC repository. Checking for updates via download."