X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a3e89a2eadb9780627751a7ad199c82fff209dee..4dc892687470cffcb0eb0c7d2d16b7577848d509:/packages/texlive/build.sh

diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index 57f1e5cb..1f59662a 100644
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@@ -2,9 +2,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_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION}
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=("ftp://ftp.tug.org/texlive/historic/${TERMUX_PKG_VERSION:0:4}/"\
 {"texlive-$_MAJOR_VERSION-texmf.tar.xz",\
 "texlive-$_MAJOR_VERSION-extra.tar.xz",\
@@ -12,7 +11,8 @@ TERMUX_PKG_SRCURL=("ftp://ftp.tug.org/texlive/historic/${TERMUX_PKG_VERSION:0:4}
 TERMUX_PKG_SHA256=("3f63708b77f8615ec6f2f7c93259c5f584d1b89dd335a28f2362aef9e6f0c9ec"
 "afe49758c26fb51c2fae2e958d3f0c447b5cc22342ba4a4278119d39f5176d7f"
 "d4e07ed15dace1ea7fabe6d225ca45ba51f1cb7783e17850bc9fe3b890239d6d")
-TERMUX_PKG_DEPENDS="wget, perl, xz-utils, gnupg2, texlive-bin (>= 20170524)"
+TERMUX_PKG_DEPENDS="wget, perl, xz-utils, gnupg2, texlive-bin (>= 20170524-5)"
+TERMUX_PKG_CONFLICTS="texlive (<< 20170524-5)"
 TERMUX_PKG_FOLDERNAME=("texlive-$_MAJOR_VERSION-texmf"
 "texlive-$_MAJOR_VERSION-extra"
 "install-tl-$_MAJOR_VERSION")
@@ -21,7 +21,7 @@ TL_FILE_LISTS=("texlive-texmf.list"
 "install-tl.list")
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-TL_ROOT=$TERMUX_PREFIX/share
+TL_ROOT=$TERMUX_PREFIX/share/texlive
 TL_BINDIR=$TERMUX_PREFIX/bin
 
 termux_step_extract_package() {
@@ -57,13 +57,7 @@ termux_step_make() {
 termux_step_create_debscripts () {
 	# Clean texlive's folder if needed (run on upgrade)
 	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" >> 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 "if [ -d $TERMUX_PREFIX/opt/texlive ]; then echo 'Removing residual files from old version of TeX Live for Termux'; rm -rf $PREFIX/opt/texlive; fi" >> preinst
 	echo "exit 0" >> preinst
 	chmod 0755 preinst