From 532351e1c98e7729a45865343dae7c709611c527 Mon Sep 17 00:00:00 2001
From: shop <shop@evilfox.cc>
Date: Thu, 25 Jun 2026 17:12:08 +0300
Subject: [PATCH] Fix server deploy: git reset --hard to avoid merge conflicts

---
 scripts/redeploy.sh | 8 ++++++--
 scripts/update.sh   | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/redeploy.sh b/scripts/redeploy.sh
index 2a37fc6..66dcf94 100644
--- a/scripts/redeploy.sh
+++ b/scripts/redeploy.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Полная пересборка и перезапуск — решает проблему «старый сайт после git pull»
+# Полная пересборка и перезапуск
 set -euo pipefail
 
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
@@ -8,7 +8,9 @@ cd "${ROOT_DIR}"
 echo "=== Shop redeploy ==="
 
 if [[ -d .git ]]; then
-  git pull origin main || true
+  echo "Обновление кода из git (сброс локальных правок скриптов)..."
+  git fetch origin main
+  git reset --hard origin/main
   export APP_VERSION=$(git describe --tags --always 2>/dev/null || git rev-parse --short HEAD)
   echo "Git: $(git log -1 --oneline)"
 else
@@ -18,6 +20,8 @@ fi
 export BUILD_TIME=$(date -u +%Y-%m-%dT%H:%M:%SZ)
 echo "Version: ${APP_VERSION}"
 
+chmod +x scripts/*.sh 2>/dev/null || true
+
 echo ""
 echo "Останавливаем app..."
 docker compose stop app 2>/dev/null || true
diff --git a/scripts/update.sh b/scripts/update.sh
index 99f5f6a..97dbebe 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -4,7 +4,9 @@ set -euo pipefail
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "${ROOT_DIR}"
 
-git pull origin main
+git fetch origin main
+git reset --hard origin/main
+chmod +x scripts/*.sh 2>/dev/null || true
 
 export APP_VERSION=$(git describe --tags --always 2>/dev/null || git rev-parse --short HEAD)
 export BUILD_TIME=$(date -u +%Y-%m-%dT%H:%M:%SZ)