From 5fca25f09792e3da1ebc5dd98f6c6d414357059b Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Sun, 15 Feb 2026 04:51:13 +0100 Subject: [PATCH] maint: improve bootstrap resilience Make the bootstrap initialization more resilient to errors. Relates-to: keymanapp/shared-sites#90 Test-bot: skip --- build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 67c3404..621b478 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 -H "Cache-Control: no-cache" -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 # TODO: these should probably all be moved to a common defines script too?