From 98fd2cebdfc0c61485e38b2d04bc8dc763c65db2 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 23 Jun 2020 21:49:49 +0000 Subject: Tue Jun 23 21:49:49 UTC 2020 ap/man-db-2.9.3-x86_64-1.txz: Upgraded. ap/mariadb-10.4.13-x86_64-3.txz: Rebuilt. Recompiled to pick up lz4 support. Thanks to Heinz Wiesinger. ap/squashfs-tools-4.4-x86_64-2.txz: Rebuilt. Added lz4 support. Thanks to Heinz Wiesinger. d/ccache-3.7.10-x86_64-1.txz: Upgraded. d/parallel-20200622-noarch-1.txz: Upgraded. d/subversion-1.14.0-x86_64-2.txz: Rebuilt. Use the system lz4 library. Thanks to Heinz Wiesinger. l/imagemagick-7.0.10_21-x86_64-1.txz: Upgraded. l/libarchive-3.4.3-x86_64-2.txz: Rebuilt. Recompiled to pick up lz4 support. Thanks to Heinz Wiesinger. l/lz4-1.9.2-x86_64-1.txz: Added. This is a new dependency for dovecot, libarchive, mariadb, rsync, squashfs-tools, subversion, and zstd. Thanks to Heinz Wiesinger. l/xxHash-0.7.3-x86_64-1.txz: Added. This is a new dependency for rsync. l/zstd-1.4.5-x86_64-2.txz: Rebuilt. Recompiled to pick up lz4 support. Thanks to Heinz Wiesinger. n/dovecot-2.3.10.1-x86_64-2.txz: Rebuilt. Recompiled to pick up lz4 support. Thanks to Heinz Wiesinger. n/libmbim-1.24.0-x86_64-1.txz: Upgraded. n/nfs-utils-2.5.1-x86_64-1.txz: Upgraded. n/ntp-4.2.8p15-x86_64-1.txz: Upgraded. This release fixes one vulnerability: Associations that use CMAC authentication between ntpd from versions 4.2.8p11/4.3.97 and 4.2.8p14/4.3.100 will leak a small amount of memory for each packet. Eventually, ntpd will run out of memory and abort. (* Security fix *) n/rsync-3.2.1-x86_64-1.txz: Upgraded. Please note that this update requires the new packages xxHash and lz4. t/texlive-2020.200608-x86_64-1.txz: Upgraded. Thanks to Johannes Schoepfer. xap/blueman-2.1.3-x86_64-2.txz: Rebuilt. As a matter of policy and since the rule already exists in /usr/share/polkit-1/rules.d/, we should not install a rules file in /etc. Note that since the file was installed as a .new, upgrading the package will not remove it and it will need to be removed manually. It's harmless if it remains, though. Thanks to Robby Workman. xap/network-manager-applet-1.18.0-x86_64-1.txz: Upgraded. --- source/t/texlive/prep/texmf_get.sh | 282 +++++++++++++++++++++---------------- 1 file changed, 161 insertions(+), 121 deletions(-) mode change 100755 => 100644 source/t/texlive/prep/texmf_get.sh (limited to 'source/t/texlive/prep/texmf_get.sh') diff --git a/source/t/texlive/prep/texmf_get.sh b/source/t/texlive/prep/texmf_get.sh old mode 100755 new mode 100644 index a079b8ada..c66a71b7f --- a/source/t/texlive/prep/texmf_get.sh +++ b/source/t/texlive/prep/texmf_get.sh @@ -1,6 +1,8 @@ #!/bin/bash -# texmf_get.sh (c) 2016 - 2019 Johannes Schoepfer, Germany, slackbuilds[at]schoepfer[dot]info +# texmf_get.sh +# +# Copyright 2016 - 2020 Johannes Schoepfer, Germany, slackbuilds@schoepfer.info # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# V 15.0.3 +# V 15.0.4 # # Prepare xz-compressed tarballs of texlive-texmf-trees based on texlive.tlpdb # This script takes care of dependencies(as far as these are present in texlive.tlpdb) @@ -35,47 +37,40 @@ # in exactly one collection. A package may have dependencies on other # packages from any collection. -# package source: http://mirror.ctan.org/systems/texlive/tlnet/archive/ - #set -e -MAJORVERSION=2019 +MAJORVERSION=2020 mirror="http://mirror.ctan.org/systems/texlive/tlnet/" -TMP=$PWD/tmp +TMP=${TMP:-$PWD/tmp} # Globally excluded packages, which are/contain # -useless without tlmgr-installer -# -non-linux +# -non-linux, e.g. texworks # -covered by an external package, e.g. asymptote on SBo # -obsolete, e.g. omega -# -java dependend packages # -binaries provided already by texlive.Slackbuild -# -binaries provided already other system packages, e.g. texlive-scripts.ARCH -# -only sources, or hyphen directives, e.g. metatype1, patch, ... -# -only hyphen directives, e.g. hyphen-farsi ... +# -binaries which texlive upstream recommends to build natively, e.g. dvisvgm on SBo +# -only sources, e.g. metatype1, patch, ... global_exclude=" + 00texlive.config + 00texlive.image + 00texlive.installation + 00texlive.installer aleph antomega asymptote bibtexu cslatex dviout.win32 - hyphen-arabic - hyphen-farsi lambda - metatype1 ocherokee oinuit omega omegaware otibet - patch texlive-common texlive-docindex texlive-msg-translations - texlive-scripts - texlive.infra - texliveonfly texosquery texworks tlcockpit @@ -117,30 +112,32 @@ texmf_editions () { biber bib2gls knitting - pgfornament - pgfplots pst-cox pst-poker pst-vectorian pst-geo bclogo - $(grep ^"name .*biblatex" $db | cut -d' ' -f2 ) + texplate + texliveonfly + kerkis " texmfget extra || exit 1 # packages/collections and their dependencies for -base PACKAGES=" - $(cat $corepackages) + $(grep ^"name hyphen-.*" $db | cut -d' ' -f2 ) + $special_packages etoolbox - xcolor memoir - velthuis - wasy ptex platex revtex - uptex - uplatex ucs + uplatex + uptex + velthuis + wasy + xcolor + xypic collection-basic collection-latex collection-metapost @@ -152,17 +149,23 @@ texmf_editions () { collection-langeuropean collection-langenglish collection-langfrench + collection-langgreek collection-langitalian collection-langpolish collection-langportuguese collection-langspanish collection-latexrecommended - $(collection_by_size fontsextra 70000 || exit 1) - $(collection_by_size publishers 10000 || exit 1) + $(collection_by_size fontsextra 70000 || exit 1) + $(collection_by_size latexextra 1000 || exit 1) + $(collection_by_size langchinese 5000 || exit 1) + $(collection_by_size langcjk 3000 || exit 1) + $(collection_by_size pictures 100000 || exit 1) + $(collection_by_size publishers 10000 || exit 1) " texmfget base # packages/collections and their dependencies for -extra PACKAGES=" + $(grep ^"name .*biblatex" $db | cut -d' ' -f2 ) amiri arabi arabi-add @@ -177,12 +180,12 @@ texmf_editions () { beebe bhcexam bxtexlogo - churchslavonic collection-fontsextra collection-langchinese collection-langcjk collection-langjapanese collection-langkorean + collection-pictures collection-publishers collection-texworks collection-wintools @@ -218,7 +221,7 @@ texmf_editions () { pdfwin pdfx powerdot-tuliplab - powerdot-FUBerlin + powerdot-fuberlin quran quran-de realhats @@ -231,13 +234,13 @@ texmf_editions () { skaknew stellenbosch suanpan + texdoctk tudscr uantwerpendocs - ucs udesoftec universalis uowthesis - wasy2-ps + wasy-type1 xduthesis xetexko xq @@ -250,11 +253,9 @@ texmf_editions () { collection-langcyrillic collection-langarabic collection-langgerman - collection-langgreek collection-langother collection-humanities collection-mathscience - collection-pictures collection-pstricks collection-music collection-games @@ -281,7 +282,7 @@ usage () { echo " to detect overlapping files" echo echo "Only new/updated/missing tex packages are downloaded." - echo "The first run takes \"long\", tex packages(about 2500Mb)" + echo "The first run takes \"long\", tex packages(about 3Gb)" echo "need to be downloaded." echo "To check out a new version/release, delete" echo "$db" @@ -339,20 +340,9 @@ package_meta () { download () { # Download packages, if not already available. Not every packages has a corresponding .doc package. - # Try three times if package isn't present, with -t1 to get another mirror the second time - cd $texmf - if [ ! -s "${1}${flavour}.tar.xz" ] - then - for run in {1..10} - do - wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz - [ -s "${1}${flavour}.tar.xz" ] && break - done - fi - # If no success by downloading, write error log - [ ! -s ${1}${flavour}.tar.xz ] && echo "Downloading ${1}${flavour}.tar.xz did not work, writing to $errorlog" && echo "$VERSION" >> $errorlog && echo "Error downloading ${1}${flavour}.tar.xz" >> $errorlog && exit 1 - - # check sha512, give three tries for downloading again(diffrent mirrors are used automatically) + # Try multiple times if package isn't present or checksum fails + + unset checksum_ok if [ "$flavour" = ".doc" ] then sha512="$(grep ^doccontainerchecksum $texmf/$1.meta | cut -d' ' -f2 )" @@ -360,26 +350,32 @@ download () { sha512="$(grep ^containerchecksum $texmf/$1.meta | cut -d' ' -f2 )" fi - for run in {1..10} + cd $texmf + + for run in {1..8} do + [ ! -s "${1}${flavour}.tar.xz" ] && \ + wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz + [ ! -s "${1}${flavour}.tar.xz" ] && continue if [ "$(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ] then - # Download (hopefully) newer file + echo "sha512sum of ${1}${flavour}.tar.xz doesn't match $texmf/$1.meta" + echo "deleting ${1}${flavour}.tar.xz" rm ${1}${flavour}.tar.xz - wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz else + checksum_ok=yes break fi done - # check sha512 again, exit if it fails - if [ "$(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ] + + # If no success by downloading, write error log + if [ -z "$checksum_ok" ] then - echo "sha512sum $(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 ) of" - echo "${package}${flavour}.tar.xz doesn't match with $db" - # delete metafile on failure to get generated again on next run, where new $db may be in use - rm $texmf/$1.meta - echo "sha512sum $sha512" - echo "Delete ${db}* to be current again, and try again." + echo "Downloading ${1}${flavour}.tar.xz or sh512sum check was not successful,\\ + writing to $errorlog" + echo "Delete ${db}* and try again." + echo "$VERSION" >> $errorlog + echo "Error downloading ${1}${flavour}.tar.xz" >> $errorlog exit 1 fi } @@ -390,7 +386,7 @@ untar () { then while read package do - echo "untar $package" + echo "untar $package$flavour" # untar all packages, check for relocation, "relocate 1" -> untar in texmf-dist download $package || exit 1 # untar package, relocate to texmf-dist if necessary, binary packages always need relocation @@ -401,7 +397,9 @@ untar () { then tar xf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated || exit 1 else - tar vxf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated | grep -E '\.sty$|\.bbx$|\.cls$' > $texmf/$package.deps + tar vxf ${package}${flavour}.tar.xz \ + --exclude tlpkg/tlpobj \ + -C $relocated | grep -E '\.sty$|\.bbx$|\.cls$' > $texmf/$package.deps if [ -n "$texmf/$package.deps" ] then unset provide @@ -433,43 +431,72 @@ untar () { fi # Delete binaries, these are provided - # by texlive.Slackbuild, keep symlinks and scripts + # by the buildscript, keep symlinks and scripts for arch in $platforms do if [ -d $texmf/texmf-dist/bin/$arch ] then - [ ! -d $texmf/texmf-dist/linked_scripts ] \ - && mkdir $texmf/texmf-dist/linked_scripts - # rewrite link target to fit systemwide installation + [ ! -d $texmf/texmf-dist/linked_scripts ] && \ + mkdir $texmf/texmf-dist/linked_scripts + # remove the unfortunate "man" link + [ -L "$texmf/texmf-dist/bin/$arch/man" ] && \ + rm $texmf/texmf-dist/bin/$arch/man for link in $(find $texmf/texmf-dist/bin/$arch -type l) do - ln -sf $(readlink $link | sed "s/^..\/..\(.*\)/..\/share\1/" ) $link || exit 1 + link_valid_dest=$texmf/texmf-dist/linked_scripts/${link##*/} + # move symlink to linked_scripts + mv $link $link_valid_dest + # some links have to dangle, because target binaries are coming from the buildscript + # fix SELFAUTOPARENT in some scripts + if [ -e "$link_valid_dest" ] + then + sed -i "s/kpsewhich -var-value=SELFAUTOPARENT/kpsewhich -var-value=TEXMFROOT/g" \ + $link_valid_dest || exit 1 + fi done - # move symlinks to linked_scripts - find $texmf/texmf-dist/bin/$arch -type l -exec mv '{}' $texmf/texmf-dist/linked_scripts/ \; # keep only binaries of special packages # remove xindy.mem(gzip compresses data) to prevent overwriting for bin in $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | \ - grep -e "executable" -e "shared object" -e "gzip compressed data" | \ - grep -e ELF -e "gzip compressed data" | cut -f 1 -d : ) + grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) do for binary in $keep_precompiled do if [ "$(echo $bin | rev | cut -d'/' -f1 | rev)" != "$binary" ] then rm $bin + echo -n "$package:" >> $binary_removed.$edition echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition fi done done # move scripts to linked-scripts - scripts="$(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | grep -wv ELF | cut -f 1 -d : )" - for script in $scripts + for script in \ + $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + |\ + grep -wv ELF | cut -f 1 -d : ) + do + echo "Moving script/bin $script to $texmf/texmf-dist/linked_scripts/" + mv $script $texmf/texmf-dist/linked_scripts/ + done + fi + done + + for tlpkg_dir in $texmf/tlpkg $texmf/texmf-dist/tlpkg + do + if [ -d $tlpkg_dir ] + then + for bin in $(find $tlpkg_dir -type f -exec file '{}' + | \ + grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) do - mv $script $texmf/texmf-dist/linked_scripts/ + echo "Deleting binary $bin found in $tlpkg_dir" + rm $bin + echo -n "$package:" >> $binary_removed.$edition + echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition done + [ -d $tlpkg_dir/TeXLive ] && \ + mkdir -p $texmf/texmf-dist/scripts/texlive && \ + mv $tlpkg_dir/TeXLive $texmf/texmf-dist/scripts/texlive fi done @@ -496,7 +523,13 @@ untar () { cut -d'(' -f2 | cut -d' ' -f1 ) byte, $package$flavour: $shortdesc" >> $output.meta.uncompressed done < $1 - # copy packages index to texmf-dist, so included packages are known in later installation + # add a path to updmap + if [ -s "$texmf/texmf-dist/linked_scripts/updmap" ] + then + sed -i '/unshift.*@INC.*/a unshift(@INC, "$TEXMFROOT/texmf-dist/scripts/texlive");' $texmf/texmf-dist/linked_scripts/updmap || exit 1 + fi + + # copy packages index to texmf-dist, to have a list of included packages in the final installation # don't list binary packages, as the binaries itself are not contained, only the symlinks. cat $output.meta | grep -v '\-linux:' >> $output.$edition.meta cat $output.meta.uncompressed | grep -v '\-linux:' >> $output.$edition.meta.uncompressed @@ -508,27 +541,25 @@ untar () { } remove_cruft () { - # Remove m$-stuff, ConTeXt single-user-system stuff, source leftovers and pdf-versions of manpages - rm -rf texmf-dist/source - rm -rf texmf-dist/scripts/context/stubs/source/ - find texmf-dist/ -type d -name 'win32' -exec rm -rf {} + - find texmf-dist/ -type d -name 'win64' -exec rm -rf {} + - find texmf-dist/ -type d -name 'mswin' -exec rm -rf {} + - find texmf-dist/ -type d -name 'win' -exec rm -rf {} + - find texmf-dist/ -type d -name 'setup' -exec rm -rf {} + - find texmf-dist/ -type d -name 'install' -exec rm -rf {} + - find texmf-dist/ -type f -name 'uninstall*.sh' -delete - find texmf-dist/ -type f -name '*.bat' -delete - find texmf-dist/ -type f -name '*.bat.w95' -delete - find texmf-dist/ -type f -name '*win32*' -delete - find texmf-dist/ -type f -name 'winansi*' -delete - find texmf-dist/ -type f -name '*man1.pdf' -delete - find texmf-dist/ -type f -name '*man5.pdf' -delete - # Remove zero-length files, as these appear e.g. in hyph-utf8 tex-package. - # find texmf-dist/ -type f -size 0c -delete - find texmf-dist/ -type f -empty -delete - # Remove empty directories recursively - find texmf-dist/ -type d -empty -delete + # Remove m$-stuff, ConTeXt single-user-system stuff, empty files/directories and pdf-manpages + rm -rf $texmf/texmf-dist/source + rm -rf $texmf/texmf-dist/scripts/context/stubs/source/ + find $texmf/texmf-dist/ -type d -name 'win32' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'win64' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'mswin' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'win' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'setup' -exec rm -rf {} + + find $texmf/texmf-dist/ -type d -name 'install' -exec rm -rf {} + + find $texmf/texmf-dist/ -type f -name 'uninstall*.sh' -delete + find $texmf/texmf-dist/ -type f -name '*.bat' -delete + find $texmf/texmf-dist/ -type f -name '*.bat.w95' -delete + find $texmf/texmf-dist/ -type f -name '*.vbs' -delete + find $texmf/texmf-dist/ -type f -name '*win32*' -delete + find $texmf/texmf-dist/ -type f -name 'winansi*' -delete + find $texmf/texmf-dist/ -type f -name '*man1.pdf' -delete + find $texmf/texmf-dist/ -type f -name '*man5.pdf' -delete + find $texmf/texmf-dist/ -type f -empty -delete + find $texmf/texmf-dist/ -type d -empty -delete } texmfget () { @@ -565,31 +596,42 @@ texmfget () { # If $collection is a singel package(not a collection-), add it here if [ -n "$(head -n1 $texmf/$collection.meta | grep -v "name collection" )" ] then - addpackage=no - # if package contains docs, add to docpackages + unset addpackage + # if package contains docs, add to docs-packages if [ -n "$(grep ^docfiles $texmf/$collection.meta)" ] then echo "$collection" >> $output_doc echo "$collection added to docs $1" >> $logfile addpackage=yes fi - if [ -n "$(grep ^runfiles $texmf/$collection.meta)" -o -n "$(grep ^binfiles $texmf/$collection.meta)" ] + # if package contains runfiles, binfiles or depend, add to edition + if [ \ + -n "$(grep ^runfiles $texmf/$collection.meta)" -o \ + -n "$(grep ^binfiles $texmf/$collection.meta)" -o \ + -n "$(grep ^depend $texmf/$collection.meta)" \ + ] then echo "$collection" >> $output echo "$collection added to -$1" >> $logfile addpackage=yes fi - # every package should be added to one dedicated edition, abort if that didn't work - if [ $addpackage = no ] + # if package contains only srcfiles, don't add to a edition + if [ -n "$(grep ^srcfiles $texmf/$collection.meta)" -a -z "$addpackage" ] then - echo "$collection doesn't contain any docfiles/runfiles/binfiles" + echo "$collection only contains srcfiles, added nowhere" >> $logfile + addpackage=yes + fi + # abort if package seems broken + if [ -z "$addpackage" ] + then + echo "$collection doesn't contain any docfiles/runfiles/binfiles/depends or srcfiles" echo "Please exclude package/report to upstream mailinglist tex-live@tug.org, bye." exit 1 fi fi # Don't handle collections as dependency of other collections, as this destroys control over what packages to be added - # add dependend packages, but no binary(ARCH) and no packages conataining a '.'. Packges with dot indicate binary/texlive-manager/windows packages + # add dependend packages, but no binary(ARCH) and no packages containing a '.'. Packges with dot indicate binary/texlive-manager/windows packages grep ^"depend " $texmf/$collection.meta | cut -d' ' -f2- > $dependencies @@ -660,8 +702,10 @@ texmfget () { [ -d $texmf/texmf-dist ] && rm -rf $texmf/texmf-dist mkdir $texmf/texmf-dist - # Make tarball/checksum reproducible by setting mtime(clamp-mtime), owner, group and sort content - # --clamp-mtime --mtime doesn't work with tar 1.13, when makepkg creates the tarball: + # Make tarball/checksum reproducible by setting mtime(clamp-mtime), + # owner, group and sort content. + # --clamp-mtime --mtime doesn't work with tar 1.13, + # when makepkg creates the tarball: # tar-1.13: time_t value 9223372036854775808 too large (max=68719476735) echo "Adding files to $( echo $tarball | rev | cut -d'/' -f1 | rev ) ..." case $edition in @@ -689,7 +733,7 @@ texmfget () { then untar $output_doc || exit 1 remove_cruft || exit 1 - #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1 + #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1 tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1 rm -rf texmf-dist fi @@ -750,7 +794,6 @@ db=$TMP/texlive.tlpdb tmpfile=$TMP/tmpfile collections_done=$TMP/done collections_tobedone=$TMP/tobedone -corepackages=$TMP/corepackages allcollections=$TMP/allcollections binary_removed=$TMP/binaries.removed manpages=$TMP/manpages @@ -777,23 +820,24 @@ echo "Building $edition tarball ..." if [ ! -s ${db}.orig -o ! -s $db -o ! -s VERSION ] then echo $MAJORVERSION.$(date +%y%m%d) > VERSION - wget -q --show-progress -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb + #wget -q --show-progress -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb + wget -q --show-progress -c -O ${db}.orig.xz ${mirror}tlpkg/texlive.tlpdb.xz + unxz ${db}.orig.xz + # remove most content from $db to be faster on later processing. # keep dependencies/manpages/binfiles/shortdesc/sizes grep -E \ '^\S|^ RELOC/doc/man|^ texmf-dist/doc/man/man|^ RELOC/doc/info/|^ texmf-dist/doc/info/|^ bin|^$' \ ${db}.orig | grep -v ^longdesc > $db - # As $db might be renewed, remove the meta-files to be created again + # As $db might be renewed, remove the all package meta-files + # to make them be created again based on (new) $db rm -rf $texmf/*.meta fi # Get linenumbers of empty lines from $db emptylines="$(grep -n ^$ $db | cut -d':' -f1)" -# Provide TLCore packages for -base, as these packages(and their dependencies) should be present in any case. -grep -B1 ^'category TLCore' $db | grep -v ^'category TLCore' | grep -v ^-- | grep -v '\.' | cut -d' ' -f2 > $corepackages - # Make a list of all collections grep ^"name collection-" $db | cut -d' ' -f2 > $allcollections @@ -809,12 +853,7 @@ do global_exclude=${global_exclude/$exclude/} fi done -# globally exclude from $corepackages -for exclude in $global_exclude -do - sed -i "/^${exclude}$/d" $corepackages -done - + VERSION=$(cat $TMP/VERSION) tarball=$TMP/texlive-$edition-$VERSION.tar # set logfile @@ -855,7 +894,6 @@ done < $allcollections # cleanup rm $allcollections -rm $corepackages rm $collections_done rm $collections_tobedone rm $output @@ -940,7 +978,8 @@ do # put map files from splitted packages in -extra mkdir meta_tmp tar xf $texmf/${package}.tar.xz -C meta_tmp tlpkg/tlpobj/$package.tlpobj - grep ^'execute ' meta_tmp/tlpkg/tlpobj/$package.tlpobj | grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition + grep ^'execute ' meta_tmp/tlpkg/tlpobj/$package.tlpobj | \ + grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition rm -rf meta_tmp fi @@ -962,6 +1001,7 @@ done # cleanup rm $files_split.tmp + # fix relocation in index for splitted packages sed -i \ -e "s|^doc|texmf-dist\/doc|g" \ -- cgit v1.2.3-79-gdb01