Update update.sh

This commit is contained in:
SpudGunMan
2025-09-28 17:17:53 -07:00
parent b738881ff1
commit dc02464662

View File

@@ -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..."