From 455fdc592e5ea22297f5c017c1f63fceb235f7bc Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 22 Feb 2024 10:34:17 -0800
Subject: [PATCH] bootstrap -D: Simplify using 'sage-package download'

---
 bootstrap | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bootstrap b/bootstrap
index 6711becb49c..ed0807e15df 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,10 +29,7 @@ cd "$SAGE_ROOT"
 
 export PATH="$SAGE_ROOT/build/bin:$PATH"
 
-properties=$(sage-package properties --format=shell configure) || echo >&2 "Error: looking up version of 'configure' failed"
-eval $properties
 MAKE="${MAKE:-make}"
-CONFVERSION=$version_with_patchlevel_configure
 
 
 bootstrap () {
@@ -179,8 +176,8 @@ SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
 bootstrap_download () {
     SAGE_DL_LOGLEVEL=""
     [ "${BOOTSTRAP_QUIET}" = "yes" ] && SAGE_DL_LOGLEVEL="--log=WARNING"
-    sage-download-file ${SAGE_DL_LOGLEVEL} configure-$CONFVERSION.tar.gz
 
+    CONFBALL=$(sage-package download $SAGE_DL_LOGLEVEL configure)
     if [ $? -ne 0 ]; then
         echo >&2 "Error: downloading configure-$CONFVERSION.tar.gz failed"
         exit 1
@@ -268,7 +265,6 @@ do
 done
 shift $(($OPTIND - 1))
 export BOOTSTRAP_QUIET
-CONFBALL="upstream/configure-$CONFVERSION.tar.gz"
 
 if [ $DOWNLOAD$SAVE = yesyes ]; then
     echo >&2 "$0: refusing to download and save."