From ad45e005f5b69162006f64e0dea9ade968a0db6ceba31b6633d2b03295b436db Mon Sep 17 00:00:00 2001 From: AidarKC Date: Tue, 7 Apr 2026 21:29:48 +0300 Subject: [PATCH] =?UTF-8?q?fix(ui):=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D0=B4=D0=B5=D0=BF?= =?UTF-8?q?=D0=BB=D0=BE=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлен скрипт deploy_shine-PWA.sh: версия сборки теперь проставляется в staged-копии и обновляется только __SHINE_BUILD_HASH__, чтобы не ломать index.html при деплое. --- deploy_shine-PWA.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/deploy_shine-PWA.sh b/deploy_shine-PWA.sh index 53b08f6..8dd7f5b 100755 --- a/deploy_shine-PWA.sh +++ b/deploy_shine-PWA.sh @@ -6,14 +6,28 @@ REMOTE_HOST="root@194.87.0.247" REMOTE_DIR="/home/user/docker/caddyFile/sites/shine-UI" BUILD_VERSION="$(date -u +%Y%m%d%H%M%S)" export BUILD_VERSION +TMP_DIR="$(mktemp -d)" + +cleanup() { + rm -rf "$TMP_DIR" +} +trap cleanup EXIT if [[ ! -d "$SRC_DIR" ]]; then echo "ERROR: source directory not found: $SRC_DIR" >&2 exit 1 fi -echo "==> Applying build version: $BUILD_VERSION" -find "$SRC_DIR" -type f \( -name "*.js" -o -name "index.html" \) -print0 | xargs -0 perl -0pi -e 's/(\.js\?v=)([^"'"'"'\''\s>]*)/$1$ENV{BUILD_VERSION}/g; s/(\.css\?v=)([^"'"'"'\''\s>]*)/$1$ENV{BUILD_VERSION}/g' +echo "==> Preparing staged UI copy with build version: $BUILD_VERSION" +rsync -a "$SRC_DIR"/ "$TMP_DIR"/ + +INDEX_FILE="$TMP_DIR/index.html" +if [[ ! -f "$INDEX_FILE" ]]; then + echo "ERROR: index.html not found in staged UI: $INDEX_FILE" >&2 + exit 1 +fi + +perl -0pi -e 's/window\.__SHINE_BUILD_HASH__\s*=\s*'\''[^'\'']*'\'';/window.__SHINE_BUILD_HASH__ = '\''$ENV{BUILD_VERSION}'\'';/' "$INDEX_FILE" echo "==> Checking SSH connectivity to $REMOTE_HOST" ssh -o BatchMode=yes -o ConnectTimeout=10 "$REMOTE_HOST" "echo SSH OK" >/dev/null @@ -21,7 +35,7 @@ ssh -o BatchMode=yes -o ConnectTimeout=10 "$REMOTE_HOST" "echo SSH OK" >/dev/nul echo "==> Preparing remote directory: $REMOTE_DIR" ssh "$REMOTE_HOST" "mkdir -p '$REMOTE_DIR'" -echo "==> Syncing files from $SRC_DIR to $REMOTE_DIR" -rsync -avz --delete "$SRC_DIR"/ "$REMOTE_HOST":"$REMOTE_DIR"/ +echo "==> Syncing staged files to $REMOTE_DIR" +rsync -avz --delete "$TMP_DIR"/ "$REMOTE_HOST":"$REMOTE_DIR"/ echo "Всё хорошо"