macos-setup.sh: libtiff: refactor curl fail logic

- Rebased against master (18edc17)
This commit is contained in:
ardnew 2022-01-31 12:53:25 -06:00
parent d06e7bd0f6
commit 84873418da
No known key found for this signature in database
GPG Key ID: 695575CCC8816281
1 changed files with 4 additions and 4 deletions

View File

@ -2045,10 +2045,10 @@ uninstall_nghttp2() {
install_libtiff() {
if [ "$LIBTIFF_VERSION" -a ! -f tiff-$LIBTIFF_VERSION-done ] ; then
echo "Downloading, building, and installing libtiff:"
[ -f tiff-$LIBTIFF_VERSION.tar.gz ] || curl -L -O https://download.osgeo.org/libtiff/tiff-$LIBTIFF_VERSION.tar.gz || exit 1
if ! gzip -t tiff-$LIBTIFF_VERSION.tar.gz ; then
rm -f tiff-$LIBTIFF_VERSION.tar.gz && curl -L -O https://download.osgeo.org/libtiff/old/tiff-$LIBTIFF_VERSION.tar.gz || exit 1
fi
[ -f tiff-$LIBTIFF_VERSION.tar.gz ] ||
curl --fail -L -O https://download.osgeo.org/libtiff/tiff-$LIBTIFF_VERSION.tar.gz ||
curl --fail -L -O https://download.osgeo.org/libtiff/old/tiff-$LIBTIFF_VERSION.tar.gz ||
exit 1
$no_build && echo "Skipping installation" && return
gzcat tiff-$LIBTIFF_VERSION.tar.gz | tar xf - || exit 1
cd tiff-$LIBTIFF_VERSION