forked from osmocom/wireshark
macos-setup.sh: libtiff: refactor curl fail logic
- Rebased against master (18edc17
)
This commit is contained in:
parent
d06e7bd0f6
commit
84873418da
|
@ -2045,10 +2045,10 @@ uninstall_nghttp2() {
|
||||||
install_libtiff() {
|
install_libtiff() {
|
||||||
if [ "$LIBTIFF_VERSION" -a ! -f tiff-$LIBTIFF_VERSION-done ] ; then
|
if [ "$LIBTIFF_VERSION" -a ! -f tiff-$LIBTIFF_VERSION-done ] ; then
|
||||||
echo "Downloading, building, and installing libtiff:"
|
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
|
[ -f tiff-$LIBTIFF_VERSION.tar.gz ] ||
|
||||||
if ! gzip -t tiff-$LIBTIFF_VERSION.tar.gz ; then
|
curl --fail -L -O https://download.osgeo.org/libtiff/tiff-$LIBTIFF_VERSION.tar.gz ||
|
||||||
rm -f tiff-$LIBTIFF_VERSION.tar.gz && curl -L -O https://download.osgeo.org/libtiff/old/tiff-$LIBTIFF_VERSION.tar.gz || exit 1
|
curl --fail -L -O https://download.osgeo.org/libtiff/old/tiff-$LIBTIFF_VERSION.tar.gz ||
|
||||||
fi
|
exit 1
|
||||||
$no_build && echo "Skipping installation" && return
|
$no_build && echo "Skipping installation" && return
|
||||||
gzcat tiff-$LIBTIFF_VERSION.tar.gz | tar xf - || exit 1
|
gzcat tiff-$LIBTIFF_VERSION.tar.gz | tar xf - || exit 1
|
||||||
cd tiff-$LIBTIFF_VERSION
|
cd tiff-$LIBTIFF_VERSION
|
||||||
|
|
Loading…
Reference in New Issue