From f51379753a1474154760fb8cef295dd8ec4c984d Mon Sep 17 00:00:00 2001
From: tranch <tranch.xiao@gmail.com>
Date: Wed, 23 Sep 2026 15:27:27 +0800
Subject: fix: adapt instruments release layout

---
 build_files/install-instruments.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'build_files')

diff --git a/build_files/install-instruments.sh b/build_files/install-instruments.sh
index f85bd3b..79f5066 100755
--- a/build_files/install-instruments.sh
+++ b/build_files/install-instruments.sh
@@ -129,13 +129,12 @@ required_paths=(
   install.sh
   appimage/AppRun
   appimage/AppRun.wrapped
-  sidecar/hhd-input-helper.cjs
-  sidecar/vendor/hhd-input-helper/instruments_hhd_input/__init__.py
+  sidecar/sidecar-main.cjs
+  sidecar/aerocore-bridge.cjs
   runtime/avionics
   runtime/cabin
   runtime/wing
   runtime/node/bin/node
-  python-wheelhouse
   pkg/systemd/ac-avionics.service
   pkg/systemd/ac-cabin.service
   pkg/systemd/ac-wing.service
@@ -151,8 +150,7 @@ for path in "${required_paths[@]}"; do
   fi
 done
 
-if [[ ! -f "$payload/pkg/aerocore-booster.sh" &&
-  ! -f "$payload/pkg/instruments-ng.sh" ]]; then
+if [[ ! -f "$payload/pkg/aerocore-booster.sh" ]]; then
   echo "Booster launcher is missing from the release payload" >&2
   exit 1
 fi
-- 
cgit v1.2.3


From 0134725c60a6ef58c270fe7c5ac17e07521c09ba Mon Sep 17 00:00:00 2001
From: tranch <tranch.xiao@gmail.com>
Date: Wed, 23 Sep 2026 15:34:35 +0800
Subject: fix: fall back to anonymous release downloads

---
 build_files/install-instruments.sh | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'build_files')

diff --git a/build_files/install-instruments.sh b/build_files/install-instruments.sh
index 79f5066..0cf5fe6 100755
--- a/build_files/install-instruments.sh
+++ b/build_files/install-instruments.sh
@@ -48,7 +48,29 @@ github_curl() {
     args+=(--header "Authorization: Bearer $(</run/secrets/GITHUB_TOKEN)")
   fi
 
-  curl "${args[@]}" "$@"
+  if curl "${args[@]}" "$@"; then
+    return 0
+  fi
+
+  # The default release repository is public. A workflow token from another
+  # repository can be rejected by GitHub (403), even though anonymous access
+  # to the same release is allowed. Retry without credentials so a stale or
+  # cross-repository token cannot break public image builds.
+  if [[ -s /run/secrets/GITHUB_TOKEN ]]; then
+    local anonymous_args=(
+      --fail
+      --location
+      --retry 3
+      --retry-delay 2
+      --retry-max-time 60
+      --silent
+      --show-error
+    )
+    curl "${anonymous_args[@]}" "$@"
+    return $?
+  fi
+
+  return 1
 }
 
 if [[ "${INSTRUMENTS_VERSION}" == "latest" ]]; then
-- 
cgit v1.2.3