osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

macos-setup.sh: fix libtiff filename and URL 

macos-setup.sh:
  - Fix filename of libtiff in existence test from "libtiff" to "tiff"
  - Added fallback URL for libtiff when the downloaded file is not a valid gzip
    archive. The host rotates older versions of libtiff into an "old"
    subdirectory, so curl downloads a 404 Web page and exits without error. Then
    the call to gzcat fails with an invalid gzip archive error. Maybe libtiff
    version should be updated instead?
This commit is contained in:
ardnew 2022-01-27 15:16:54 -06:00
parent 18edc17bf3
commit d06e7bd0f6
No known key found for this signature in database
GPG Key ID: 695575CCC8816281
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/macos-setup.sh
View File

@ -2045,7 +2045,10 @@ uninstall_nghttp2() {
install_libtiff() {
if [ "$LIBTIFF_VERSION" -a ! -f tiff-$LIBTIFF_VERSION-done ] ; then
echo "Downloading, building, and installing libtiff:"
[ -f libtiff-$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 ] || 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
$no_build && echo "Skipping installation" && return
gzcat tiff-$LIBTIFF_VERSION.tar.gz | tar xf - || exit 1
cd tiff-$LIBTIFF_VERSION