From 43246f018e413a3ff27e824f1bd63290960a6db8 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <Henrik@Grimler.se>
Date: Fri, 26 Jan 2018 09:43:18 +0100
Subject: [PATCH] texlive: Correctly remove old files

---
 packages/texlive-bin/build.sh |  9 ++-------
 packages/texlive/build.sh     | 11 +++--------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index d835c9d96..871162de0 100644
--- a/packages/texlive-bin/build.sh
+++ b/packages/texlive-bin/build.sh
@@ -9,6 +9,7 @@ TERMUX_PKG_DEPENDS="freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, po
 TERMUX_PKG_BUILD_DEPENDS="icu-devtools"
 TERMUX_PKG_BREAKS="texlive (<< 20170524-3)"
 TERMUX_PKG_REPLACES="texlive (<< 20170524-3)"
+#TERMUX_PKG_CONFLICTS="texlive-bin (<< 20170524-8)"
 TERMUX_PKG_RECOMMENDS="texlive"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 
@@ -140,13 +141,7 @@ termux_step_post_make_install () {
 termux_step_create_debscripts () {
 	# Clean texlive's folder if needed (run on fresh install)
 	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 $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
 }
diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index 765e2180d..1f59662a7 100644
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@@ -11,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")
@@ -56,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