From 104ad0229f2cbf68c1d2ff9c69bff1d8fd291b46 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 9 Oct 2017 18:34:10 +0200 Subject: [PATCH 1/1] texlive-bin: enable extglob locally in preinst script (#1643) * texlive-bin: enable extglob locally in preinst script. Solves https://github.com/termux/termux-packages/issues/1639 * texlive-bin: re-add TMPDIR to profile.d/texlive.sh * texlive: use extglob in preinst script --- packages/texlive-bin/build.sh | 5 ++++- packages/texlive/build.sh | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh index 5582bd7e..5bf07002 100644 --- a/packages/texlive-bin/build.sh +++ b/packages/texlive-bin/build.sh @@ -3,7 +3,7 @@ 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=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION} 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" @@ -131,6 +131,7 @@ 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 "#!$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" @@ -149,7 +150,9 @@ termux_step_create_debscripts () { echo "rm -rf $TERMUX_PREFIX/etc/profile.d/texlive.sh" >> preinst 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 } diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh index 7f2f472b..f42bbe94 100644 --- a/packages/texlive/build.sh +++ b/packages/texlive/build.sh @@ -61,7 +61,9 @@ termux_step_create_debscripts () { echo "rm -rf $TERMUX_PREFIX/etc/profile.d/texlive.sh" >> preinst 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 -- 2.11.0