From dc02464662b9cbeb28f554b6916cd02c7b5f2d62 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Sun, 28 Sep 2025 17:17:53 -0700 Subject: [PATCH] Update update.sh --- update.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/update.sh b/update.sh index eddc6aa..37fae9c 100644 --- a/update.sh +++ b/update.sh @@ -24,15 +24,11 @@ if systemctl is-active --quiet mesh_bot_w3.service; then service_stopped=true fi -# Update the local repository -echo "Updating local repository..." -#git fetch --all - # if git pull has conflicts, ask to reset hard -# check if git is here (if not likely in venv ask to run outside as well) if ! command -v git &> /dev/null; then echo "Git command not found. Please run this script with permissions to access git. (if updating in venv, run outside of it)" else + echo "Pulling latest changes from GitHub..." if ! git pull origin main --rebase; then read -p "Git pull resulted in conflicts. Do you want to reset hard to origin/main? This will discard local changes. (y/n): " choice if [[ "$choice" == "y" || "$choice" == "Y" ]]; then @@ -43,6 +39,7 @@ else echo "Update aborted due to git conflicts." fi fi +fi # Install or update dependencies echo "Installing or updating dependencies..."