From 268b7abfe4a315dd567aab86efd354f4644e6307 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Sun, 15 Feb 2026 04:54:07 +0100 Subject: [PATCH] maint: improve bootstrap resilience Make the bootstrap initialization more resilient to errors. Relates-to: keymanapp/shared-sites#90 Test-bot: skip --- .gitignore | 1 + build.sh | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 73f1548..ca5964f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ # Shared files are bootstrapped: resources/bootstrap.inc.sh resources/.bootstrap-version +resources/.bootstrap-registry _common/ diff --git a/build.sh b/build.sh index 76f57c7..af8b4e6 100755 --- a/build.sh +++ b/build.sh @@ -3,7 +3,11 @@ readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh" readonly BOOTSTRAP_VERSION=v1.0.10 -[ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh) +if ! [ -f "$BOOTSTRAP" ] || ! source "$BOOTSTRAP"; then + curl -H "Cache-Control: no-cache" --fail --silent --show-error -w "curl: Finished attempt to download %{url}" "https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh" -o "$BOOTSTRAP.tmp" || exit 1 + source "$BOOTSTRAP.tmp" + rm -f "$BOOTSTRAP.tmp" +fi ## END STANDARD SITE BUILD SCRIPT INCLUDE readonly PROXY_CONTAINER_NAME=local-proxy-website