texlive: Move files to std locations [WIP]

diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index 98a3d28a8639299c7e90b401c8f8efacbf233de6..cc8765a4dfdb2f3832663ec042fd3266e56e74ad 100644 (file)
--- a/packages/texlive-bin/build.sh
+++ b/packages/texlive-bin/build.sh
@@ -1,5 +1,5 @@
 TERMUX_PKG_HOMEPAGE=https://www.tug.org/texlive/
-TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system."
+TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system. This package contains architecture dependent binaries."
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=20170524
 TERMUX_PKG_REVISION=8
@@ -12,8 +12,8 @@ TERMUX_PKG_REPLACES="texlive (<< 20170524-3)"
 TERMUX_PKG_RECOMMENDS="texlive"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 
-TL_ROOT=$TERMUX_PREFIX/opt/texlive/${TERMUX_PKG_VERSION:0:4}
-TL_BINDIR=$TL_ROOT/bin/custom
+TL_ROOT=$TERMUX_PREFIX/share/texlive
+TL_BINDIR=$TERMUX_PREFIX/bin
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 AR=ar \
@@ -72,53 +72,53 @@ ac_cv_c_bigendian=no \
 
 # 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
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/web2c/texmf.cnf
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/web2c/mktex.opt
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/web2c/mktexdir.opt
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/web2c/mktexnam.opt
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/web2c/fmtutil.cnf
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/web2c/mktexdir
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/web2c/mktexnam
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/web2c/mktexupd
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvipdfmx/dvipdfmx.cfg
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/base/color.pro
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/base/crop.pro
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/base/finclude.pro
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/base/hps.pro
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/base/special.pro
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/base/tex.pro
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/base/texps.pro
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/base/texc.pro
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/dvips/gsftopk/render.ps
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/allcm.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/allneeded.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/dvi2fax.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/dvired.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/kpsetool.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/kpsewhere.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/texconfig-dialog.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/texconfig-sys.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/texconfig.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/texlinks.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/fmtutil-sys.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/fmtutil.pl
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/tlmgr.pl
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/updmap-sys.sh
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/texlive/updmap.pl
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/simpdftex/simpdftex
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/fonts/cmap/dvipdfmx/EUC-UCS2
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/fonts/map/glyphlist/pdfglyphlist.txt
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/fonts/map/glyphlist/glyphlist.txt
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/fonts/map/glyphlist/texglyphlist.txt
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/fonts/map/dvipdfmx/cid-x.map
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/fonts/enc/dvips/base/7t.enc
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/luaotfload/luaotfload-tool.lua
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/oberdiek/pdfatfi.pl
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/lua2dox/lua2dox_filter
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/context/perl/mptopdf.pl
-opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/scripts/checkcites/checkcites.lua"
+share/texlive/texmf-dist/texconfig/tcfmgr.map
+share/texlive/texmf-dist/texconfig/tcfmgr
+share/texlive/texmf-dist/web2c/texmf.cnf
+share/texlive/texmf-dist/web2c/mktex.opt
+share/texlive/texmf-dist/web2c/mktexdir.opt
+share/texlive/texmf-dist/web2c/mktexnam.opt
+share/texlive/texmf-dist/web2c/fmtutil.cnf
+share/texlive/texmf-dist/web2c/mktexdir
+share/texlive/texmf-dist/web2c/mktexnam
+share/texlive/texmf-dist/web2c/mktexupd
+share/texlive/texmf-dist/dvipdfmx/dvipdfmx.cfg
+share/texlive/texmf-dist/dvips/base/color.pro
+share/texlive/texmf-dist/dvips/base/crop.pro
+share/texlive/texmf-dist/dvips/base/finclude.pro
+share/texlive/texmf-dist/dvips/base/hps.pro
+share/texlive/texmf-dist/dvips/base/special.pro
+share/texlive/texmf-dist/dvips/base/tex.pro
+share/texlive/texmf-dist/dvips/base/texps.pro
+share/texlive/texmf-dist/dvips/base/texc.pro
+share/texlive/texmf-dist/dvips/gsftopk/render.ps
+share/texlive/texmf-dist/scripts/texlive/allcm.sh
+share/texlive/texmf-dist/scripts/texlive/allneeded.sh
+share/texlive/texmf-dist/scripts/texlive/dvi2fax.sh
+share/texlive/texmf-dist/scripts/texlive/dvired.sh
+share/texlive/texmf-dist/scripts/texlive/kpsetool.sh
+share/texlive/texmf-dist/scripts/texlive/kpsewhere.sh
+share/texlive/texmf-dist/scripts/texlive/texconfig-dialog.sh
+share/texlive/texmf-dist/scripts/texlive/texconfig-sys.sh
+share/texlive/texmf-dist/scripts/texlive/texconfig.sh
+share/texlive/texmf-dist/scripts/texlive/texlinks.sh
+share/texlive/texmf-dist/scripts/texlive/fmtutil-sys.sh
+share/texlive/texmf-dist/scripts/texlive/fmtutil.pl
+share/texlive/texmf-dist/scripts/texlive/tlmgr.pl
+share/texlive/texmf-dist/scripts/texlive/updmap-sys.sh
+share/texlive/texmf-dist/scripts/texlive/updmap.pl
+share/texlive/texmf-dist/scripts/simpdftex/simpdftex
+share/texlive/texmf-dist/fonts/cmap/dvipdfmx/EUC-UCS2
+share/texlive/texmf-dist/fonts/map/glyphlist/pdfglyphlist.txt
+share/texlive/texmf-dist/fonts/map/glyphlist/glyphlist.txt
+share/texlive/texmf-dist/fonts/map/glyphlist/texglyphlist.txt
+share/texlive/texmf-dist/fonts/map/dvipdfmx/cid-x.map
+share/texlive/texmf-dist/fonts/enc/dvips/base/7t.enc
+share/texlive/texmf-dist/scripts/luaotfload/luaotfload-tool.lua
+share/texlive/texmf-dist/scripts/oberdiek/pdfatfi.pl
+share/texlive/texmf-dist/scripts/lua2dox/lua2dox_filter
+share/texlive/texmf-dist/scripts/context/perl/mptopdf.pl
+share/texlive/texmf-dist/scripts/checkcites/checkcites.lua"
 
 termux_step_pre_configure() {
        # When building against libicu 59.1 or later we need c++11:
@@ -126,12 +126,6 @@ termux_step_pre_configure() {
 }
 
 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"
        mv $TL_BINDIR/tlmgr $TL_BINDIR/tlmgr.ln
        echo "#!$TERMUX_PREFIX/bin/sh" > $TL_BINDIR/tlmgr

diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index 7aae3f1e2ad893cc4ad9d74a17b238faa5eea11c..2123e09fb7b6026b4ad7b7ff8dd0e133c173ad5a 100644 (file)
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@@ -21,8 +21,8 @@ TL_FILE_LISTS=("texlive-texmf.list"
 "install-tl.list")
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-TL_ROOT=$TERMUX_PREFIX/opt/texlive/${TERMUX_PKG_VERSION:0:4}
-TL_BINDIR=$TL_ROOT/bin/custom
+TL_ROOT=$TERMUX_PREFIX/share
+TL_BINDIR=$TERMUX_PREFIX/bin
 
 termux_step_extract_package() {
        mkdir -p "$TERMUX_PKG_SRCDIR"
@@ -47,10 +47,10 @@ termux_step_make() {
        for index in $( seq 0 2 ); do
                cp -r $TERMUX_PKG_SRCDIR/${TERMUX_PKG_FOLDERNAME[$index]}/* $TL_ROOT/
        done
-
+       
        mkdir -p $TL_ROOT/{tlpkg/{backups,tlpobj},texmf-var/web2c}
        cp $TERMUX_PKG_BUILDER_DIR/texlive.tlpdb $TL_ROOT/tlpkg/
-
+       
        perl -I$TL_ROOT/tlpkg/ $TL_ROOT/texmf-dist/scripts/texlive/mktexlsr.pl $TL_ROOT/texmf-dist
 }
 
@@ -69,7 +69,6 @@ termux_step_create_debscripts () {
        
        echo "#!$TERMUX_PREFIX/bin/bash" > postinst
        echo "mkdir -p $TL_ROOT/{tlpkg/{backups,tlpobj},texmf-var/{web2c,tex/generic/config}}" >> postinst
-       echo "export PATH=\$PATH:$TL_BINDIR" >> postinst
        echo "export TMPDIR=$TERMUX_PREFIX/tmp" >> postinst
        echo "echo Updating tlmgr" >> postinst
        echo "tlmgr update --self" >> postinst
@@ -83,8 +82,6 @@ termux_step_create_debscripts () {
        echo "echo 'TeX Live is a joint project of the TeX user groups around the world;'" >> postinst
        echo "echo 'please consider supporting it by joining the group best for you.'" >> postinst
        echo "echo 'The list of groups is available on the web at http://tug.org/usergroups.html.'" >> postinst
-       echo "echo ''" >> postinst
-       echo "echo 'Please run \"source $PREFIX/etc/profile.d/texlive.sh\" to add texlive'\''s binaries to your current shell'\''s PATH.'" >> postinst
        echo "exit 0" >> postinst
        chmod 0755 postinst