X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/26e4ec30cfaafa3e88a497d8d8efb3382a91e52c..76f9dc9398c803c95331aa8b04ec7a81b8b7df0c:/packages/texlive-bin/build.sh

diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index 6127915c..871162de 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
 
@@ -130,6 +131,8 @@ termux_step_post_make_install () {
 	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
+	echo "sed -i 's%\`kpsewhich -var-value=SELFAUTOPARENT\`);%\`kpsewhich -var-value=TEXMFROOT\`);%g' $TL_ROOT/texmf-dist/scripts/texlive/tlmgr.pl" >> $TL_BINDIR/tlmgr
+
 	echo "sed -E -i '"'s@`/bin/sh@`'$TERMUX_PREFIX"/bin/sh@g' ${TL_ROOT}/tlpkg/TeXLive/TLUtils.pm" >> $TL_BINDIR/tlmgr
 	echo 'tlmgr.ln "$@"' >> $TL_BINDIR/tlmgr
 	chmod 0744 $TL_BINDIR/tlmgr
@@ -138,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
 }