Skip to content

Commit

Permalink
bootstrap -D: Simplify using 'sage-package download'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koeppe committed Feb 22, 2024
1 parent 1167e16 commit 455fdc5
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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."
Expand Down

0 comments on commit 455fdc5

Please sign in to comment.