Fix Matplotlib download/unpack from GitHub

alisw · Mar 2, 2018 · be008b8 · be008b8
1 parent 6e73f17
commit be008b8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/python-modules.sh b/python-modules.sh
@@ -59,11 +59,10 @@ done
 unset PYTHONUSERBASE
 
 # Install matplotlib (quite tricky)
-MATPLOTLIB_VER="1.4.3"
-MATPLOTLIB_URL="https://github.com/matplotlib/matplotlib/archive/${MATPLOTLIB_VER}.tar.gz"
-curl -Lo matplotlib.tgz $MATPLOTLIB_URL
-tar xzf matplotlib.tgz
-cd matplotlib-$MATPLOTLIB_VER
+MATPLOTLIB_GITREF="v1.4.3"
+MATPLOTLIB_URL="https://github.com/matplotlib/matplotlib/archive/${MATPLOTLIB_GITREF}.tar.gz"
+curl -SsL "$MATPLOTLIB_URL" | tar xzf -
+cd matplotlib-*
 cat > setup.cfg <<EOF
 [directories]
 basedirlist  = ${FREETYPE_ROOT:+$PWD/fake_freetype_root,$FREETYPE_ROOT,}${LIBPNG_ROOT:+$LIBPNG_ROOT,}${ZLIB_ROOT:+$ZLIB_ROOT,}/usr/X11R6,$(freetype-config --prefix),$(libpng-config --prefix)