From a74f683fab2f2c4b84af7521b57345075aacf1b2 Mon Sep 17 00:00:00 2001
From: durzo <durzo@users.noreply.github.com>
Date: Sat, 3 Oct 2026 19:49:13 +0100
Subject: [PATCH] Tracearr: workaround for failing map tiles download and data
 preservation (#17661)

---
 ct/tracearr.sh              | 7 +++++--
 install/tracearr-install.sh | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ct/tracearr.sh b/ct/tracearr.sh
index 55269b814..f11026076 100644
--- a/ct/tracearr.sh
+++ b/ct/tracearr.sh
@@ -122,7 +122,8 @@ EOF
     $STD pnpm install --frozen-lockfile --force
     $STD pnpm turbo telemetry disable
     $STD pnpm turbo run build --no-daemon --filter=@tracearr/shared --filter=@tracearr/server --filter=@tracearr/web
-    $STD ./scripts/fetch-basemap.sh
+    $STD ./scripts/fetch-basemap.sh || msg_warn "Basemap download failed, keeping the existing map"
+    [[ -d /opt/tracearr/data ]] && mv /opt/tracearr/data /opt/tracearr.data
     rm -rf /opt/tracearr
     mkdir -p /opt/tracearr/{packages/shared,packages/emails,apps/server,apps/web,apps/server/src/db}
     cp -rf package.json /opt/tracearr/
@@ -137,7 +138,9 @@ EOF
     cp -rf packages/emails/package.json /opt/tracearr/packages/emails/
     cp -rf packages/emails/dist /opt/tracearr/packages/emails/dist
     cp -rf apps/server/src/db/migrations /opt/tracearr/apps/server/src/db/migrations
-    cp -rf data /opt/tracearr/data
+    [[ -d /opt/tracearr.data ]] && mv /opt/tracearr.data /opt/tracearr/data
+    mkdir -p /opt/tracearr/data
+    cp -rf data/. /opt/tracearr/data/
     mkdir -p /opt/tracearr/data/image-cache
     rm -rf /opt/tracearr.build
     cd /opt/tracearr
diff --git a/install/tracearr-install.sh b/install/tracearr-install.sh
index 846d7ba4c..3e81f2df0 100644
--- a/install/tracearr-install.sh
+++ b/install/tracearr-install.sh
@@ -67,7 +67,7 @@ cd /opt/tracearr.build
 $STD pnpm install --frozen-lockfile --force
 $STD pnpm turbo telemetry disable
 $STD pnpm turbo run build --no-daemon --filter=@tracearr/shared --filter=@tracearr/server --filter=@tracearr/web
-$STD ./scripts/fetch-basemap.sh
+$STD ./scripts/fetch-basemap.sh || msg_warn "Basemap download failed, the map will show without base tiles"
 mkdir -p /opt/tracearr/{packages/shared,packages/emails,apps/server,apps/web,apps/server/src/db}
 cp -rf package.json /opt/tracearr/
 cp -rf pnpm-workspace.yaml /opt/tracearr/