From 9278a26a7d9c69c24bf3b847d4207f01bb9dbb30 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Fri, 16 Jul 2021 15:55:33 +0200 Subject: [PATCH] make_osx: do not download python pkg unnecessarily --- contrib/osx/make_osx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx index 3fd67f322..abbf91d46 100755 --- a/contrib/osx/make_osx +++ b/contrib/osx/make_osx @@ -64,11 +64,13 @@ function DoCodeSignMaybe { # ARGS: infoName fileOrDirName } info "Installing Python $PYTHON_VERSION" -curl -o "$CACHEDIR/python-${PYTHON_VERSION}-macosx10.9.pkg" \ - "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macosx10.9.pkg" -echo "bf54a14eef23467991e8c7a88c7307762e484c024a94ec1ee292ac1db3d41fc9 $CACHEDIR/python-${PYTHON_VERSION}-macosx10.9.pkg" | shasum -a 256 -c \ - || fail "python pkg checksum mismatched" -sudo installer -pkg "$CACHEDIR/python-${PYTHON_VERSION}-macosx10.9.pkg" -target / \ +PKG_FILE="python-${PYTHON_VERSION}-macosx10.9.pkg" +if [ ! -f "$CACHEDIR/$PKG_FILE" ]; then + curl -o "$CACHEDIR/$PKG_FILE" "https://www.python.org/ftp/python/${PYTHON_VERSION}/$PKG_FILE" +fi +echo "bf54a14eef23467991e8c7a88c7307762e484c024a94ec1ee292ac1db3d41fc9 $CACHEDIR/$PKG_FILE" | shasum -a 256 -c \ + || fail "python pkg checksum mismatched" +sudo installer -pkg "$CACHEDIR/$PKG_FILE" -target / \ || fail "failed to install python" # sanity check "python3" has the version we just installed.