X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1b3f3ebde9f9203b770be363e99899984b35493d..d0195549d7b50b84fec1f1ff889861817730c6be:/packages/texlive-bin/build.sh

diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index 44b6c88e..702ccbdb 100644
--- a/packages/texlive-bin/build.sh
+++ b/packages/texlive-bin/build.sh
@@ -1,10 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://www.tug.org/texlive/
 TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system."
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
-_MAJOR_VERSION=20170524
-_MINOR_VERSION=
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION}
+TERMUX_PKG_VERSION=20170524
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SRCURL=ftp://tug.org/historic/systems/texlive/${TERMUX_PKG_VERSION:0:4}/texlive-${TERMUX_PKG_VERSION}-source.tar.xz
 TERMUX_PKG_SHA256="0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa"
 TERMUX_PKG_DEPENDS="freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz-icu, perl"
@@ -72,7 +70,7 @@ ac_cv_c_bigendian=no \
 --without-x \
 --with-banner-add=/Termux"
 
-# These files are provided by texlive-base:
+# These files are provided by texlive:
 TERMUX_PKG_RM_AFTER_INSTALL="
 opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/texconfig/tcfmgr.map
 opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/texconfig/tcfmgr
@@ -125,13 +123,18 @@ opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/checkcites/checkcites.l
 termux_step_pre_configure() {
 	# When building against libicu 59.1 or later we need c++11:
 	CXXFLAGS+=" -std=c++11"
+	# Oz flag causes problems. See https://github.com/termux/termux-packages/issues/1765:
+	CFLAGS=${CFLAGS/Oz/O3}
 }
 
 termux_step_post_make_install () {
+	# Add bin dir to path for new shells (doesn't work for zsh and others)
 	mkdir -p $TERMUX_PREFIX/etc/profile.d/
-	echo "export PATH=\$PATH:$TL_BINDIR" > $TERMUX_PREFIX/etc/profile.d/texlive.sh
-	echo "export TMPDIR=$TERMUX_PREFIX/tmp/" >> $TERMUX_PREFIX/etc/profile.d/texlive.sh
+	echo "#!$TERMUX_PREFIX/bin/sh" > $TERMUX_PREFIX/etc/profile.d/texlive.sh
+	echo "export TMPDIR=$TERMUX_PREFIX/tmp" >> $TERMUX_PREFIX/etc/profile.d/texlive.sh
+	echo "export PATH=\$PATH:$TL_BINDIR" >> $TERMUX_PREFIX/etc/profile.d/texlive.sh
 	chmod 0744 $TERMUX_PREFIX/etc/profile.d/texlive.sh
+	# Replace tlmgr link with a small wrapper that prevents common break on "tlmgr update --self"
 	mv $TL_BINDIR/tlmgr $TL_BINDIR/tlmgr.ln
 	echo "#!$TERMUX_PREFIX/bin/sh" > $TL_BINDIR/tlmgr
 	echo "termux-fix-shebang $TL_ROOT/texmf-dist/scripts/texlive/tlmgr.pl" >> $TL_BINDIR/tlmgr
@@ -142,11 +145,14 @@ termux_step_post_make_install () {
 
 termux_step_create_debscripts () {
 	# Clean texlive's folder if needed (run on fresh install)
-	echo "if [ ! -f $TERMUX_PREFIX/opt/texlive/2016/install-tl -a ! -f $TERMUX_PREFIX/opt/texlive/2017/install-tl ]; then exit 0; else echo 'Removing residual files from old version of TeX Live for Termux'; fi" > preinst
+	echo "#!$TERMUX_PREFIX/bin/bash" > preinst
+	echo "if [ ! -f $TERMUX_PREFIX/opt/texlive/2016/install-tl -a ! -f $TERMUX_PREFIX/opt/texlive/2017/install-tl ]; then exit 0; else echo 'Removing residual files from old version of TeX Live for Termux'; fi" >> preinst
 	echo "rm -rf $TERMUX_PREFIX/etc/profile.d/texlive.sh" >> preinst
-	echo "rm -rf $TERMUX_PREFIX/opt/texlive/2016"
+	echo "rm -rf $TERMUX_PREFIX/opt/texlive/2016" >> preinst
 	# Let's not delete the previous texmf-dist so that people who have installed a full distribution won't need to download everything again
+	echo "shopt -s extglob" >> preinst # !(texmf-dist) is an extended glob which is turned off in scripts
 	echo "rm -rf $TERMUX_PREFIX/opt/texlive/2017/!(texmf-dist)" >> preinst
+	echo "shopt -u extglob" >> preinst # disable extglob again just in case
 	echo "exit 0" >> preinst
 	chmod 0755 preinst
 }