From 29b48a5607e7f07b433e5dc2bf676236555fa94d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 24 Apr 2017 13:43:30 +0200 Subject: [PATCH] texlive: fix installation issues and reported shebang issue (#957) * texlive: correctly move man pages, add wget as dependecy and fix shebangs of some scripts. * texlive: busybox version of rm doesn't support -d * texlive: Don't fix shebangs in texmf-dist/scripts/texlive (gives error when installing), so far no one has reported shebang errors from files in this folder. --- packages/texlive/build.sh | 7 ++++--- packages/texlive/termux-install-tl.sh | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh index 8b5cb75f..f760802a 100644 --- a/packages/texlive/build.sh +++ b/packages/texlive/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system _MAJOR_VERSION=20160523 _MINOR_VERSION=b TERMUX_PKG_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION} -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=ftp://tug.org/historic/systems/texlive/${TERMUX_PKG_VERSION:0:4}/texlive-${TERMUX_PKG_VERSION}-source.tar.xz TERMUX_PKG_SHA256="a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed" -TERMUX_PKG_DEPENDS="freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz-icu, perl, xz-utils" +TERMUX_PKG_DEPENDS="freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz-icu, perl, xz-utils, wget" TERMUX_PKG_FOLDERNAME=texlive-${_MAJOR_VERSION}-source # change the bin directory to "$TERMUX_PREFIX/opt/texlive/2016/bin/pkg" because the installer will symlink this to the actual bin dir.. @@ -70,7 +70,8 @@ termux_step_pre_configure() { termux_step_post_make_install () { mkdir -p $TERMUX_PREFIX/share/man/man{1,5}/ - mv $TERMUX_PREFIX/opt/texlive/2016/share/man/man{1,5}/* $TERMUX_PREFIX/share/man/man1/ + mv $TERMUX_PREFIX/opt/texlive/2016/share/man/man1/* $TERMUX_PREFIX/share/man/man1/ + mv $TERMUX_PREFIX/opt/texlive/2016/share/man/man5/* $TERMUX_PREFIX/share/man/man5/ cp $TERMUX_PKG_BUILDER_DIR/termux-install-tl.sh $TERMUX_PREFIX/bin/termux-install-tl } diff --git a/packages/texlive/termux-install-tl.sh b/packages/texlive/termux-install-tl.sh index f5e19cdb..bb77ce61 100755 --- a/packages/texlive/termux-install-tl.sh +++ b/packages/texlive/termux-install-tl.sh @@ -62,10 +62,14 @@ XXHEREXX #fix tlpkg sed -E -i "s@/bin/sh@$PREFIX/bin/sh@" ${TL_ROOT}/${TL_VERSION}/tlpkg/TeXLive/TLUtils.pm +#fix shebangs +sed -i -E "1 s@^#\!(.*)/[sx]?bin/(.*)@#\!$PREFIX/bin/\2@" ${TL_ROOT}/${TL_VERSION}/texmf-dist/web2c/* +sed -i -E "1 s@^#\!(.*)/[sx]?bin/(.*)@#\!$PREFIX/bin/\2@" ${TL_ROOT}/${TL_VERSION}/bin/custom/* + #source the environment . $PREFIX/etc/profile.d/texlive.sh #setup links texlinks -rm -rdf $TMPDIR/termux-tl-installer +rm -rf $TMPDIR/termux-tl-installer -- 2.11.0