texlive[53235] Build/source/texk/kpathsea: remove internal mktex*
commits+karl at tug.org
commits+karl at tug.org
Thu Dec 26 00:23:15 CET 2019
Revision: 53235
http://tug.org/svn/texlive?view=revision&revision=53235
Author: karl
Date: 2019-12-26 00:23:15 +0100 (Thu, 26 Dec 2019)
Log Message:
-----------
remove internal mktex* scripts from kpathsea, also now maintained only in Master/texmf-dist/web2c
Modified Paths:
--------------
trunk/Build/source/texk/kpathsea/ChangeLog
trunk/Build/source/texk/kpathsea/Makefile.am
trunk/Build/source/texk/kpathsea/Makefile.in
Removed Paths:
-------------
trunk/Build/source/texk/kpathsea/mktex.cnf
trunk/Build/source/texk/kpathsea/mktexdir
trunk/Build/source/texk/kpathsea/mktexnam
trunk/Build/source/texk/kpathsea/mktexupd
Modified: trunk/Build/source/texk/kpathsea/ChangeLog
===================================================================
--- trunk/Build/source/texk/kpathsea/ChangeLog 2019-12-25 23:16:06 UTC (rev 53234)
+++ trunk/Build/source/texk/kpathsea/ChangeLog 2019-12-25 23:23:15 UTC (rev 53235)
@@ -1,10 +1,18 @@
2019-12-26 Karl Berry <karl at tug.org>
+ * mktexdir,
+ * mktexnam,
+ * mktexupd,
* mktex.opt,
* mktexdir.opt,
* mktexnam.opt: remove; these will now be maintained
(if changes are needed) only in Master/texmf-dist/web2c.
- * Makefile.am (dist_web2c_DATA): remove.
+ * Makefile.am (dist_web2c_DATA, dist_web2c_SCRIPTS): remove.
+ (All this is primarily so that $Id$ expansions will not be lost;
+ the user-level mktex* scripts will happen in a few days.)
+
+ * mktex.cnf: remove this unused file.
+ * Makefile.am (EXTRA_DIST): remove it here.
2019-12-22 Karl Berry <karl at freefriends.org>
Modified: trunk/Build/source/texk/kpathsea/Makefile.am
===================================================================
--- trunk/Build/source/texk/kpathsea/Makefile.am 2019-12-25 23:16:06 UTC (rev 53234)
+++ trunk/Build/source/texk/kpathsea/Makefile.am 2019-12-25 23:23:15 UTC (rev 53235)
@@ -251,8 +251,6 @@
## The scripts and their data
web2cdir = $(datarootdir)/texmf-dist/web2c
-dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
-
dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
dist_noinst_DATA = texmf.cnf
Modified: trunk/Build/source/texk/kpathsea/Makefile.in
===================================================================
--- trunk/Build/source/texk/kpathsea/Makefile.in 2019-12-25 23:16:06 UTC (rev 53234)
+++ trunk/Build/source/texk/kpathsea/Makefile.in 2019-12-25 23:23:15 UTC (rev 53235)
@@ -134,8 +134,8 @@
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(dist_noinst_SCRIPTS) \
- $(dist_web2c_SCRIPTS) $(dist_noinst_DATA) \
- $(kpseinclude_HEADERS) $(noinst_HEADERS) $(am__DIST_COMMON)
+ $(dist_noinst_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -143,8 +143,8 @@
CONFIG_CLEAN_FILES = kpathsea.pc
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
- "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"
+ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \
+ "$(DESTDIR)$(kpseincludedir)"
PROGRAMS = $(bin_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -250,7 +250,7 @@
xdirtest_SOURCES = xdirtest.c
xdirtest_OBJECTS = xdirtest.$(OBJEXT)
xdirtest_DEPENDENCIES = libkpathsea.la
-SCRIPTS = $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS)
+SCRIPTS = $(dist_noinst_SCRIPTS)
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -858,7 +858,6 @@
progname_test_LDADD = libkpathsea.la
xdirtest_LDADD = libkpathsea.la
web2cdir = $(datarootdir)/texmf-dist/web2c
-dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
dist_noinst_DATA = texmf.cnf
bin_links = mktexlsr:texhash
@@ -1040,42 +1039,7 @@
xdirtest$(EXEEXT): $(xdirtest_OBJECTS) $(xdirtest_DEPENDENCIES) $(EXTRA_xdirtest_DEPENDENCIES)
@rm -f xdirtest$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(xdirtest_OBJECTS) $(xdirtest_LDADD) $(LIBS)
-install-dist_web2cSCRIPTS: $(dist_web2c_SCRIPTS)
- @$(NORMAL_INSTALL)
- @list='$(dist_web2c_SCRIPTS)'; test -n "$(web2cdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(web2cdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(web2cdir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n' \
- -e 'h;s|.*|.|' \
- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
- if (++n[d] == $(am__install_max)) { \
- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
- else { print "f", d "/" $$4, $$1 } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(web2cdir)$$dir'"; \
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(web2cdir)$$dir" || exit $$?; \
- } \
- ; done
-uninstall-dist_web2cSCRIPTS:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_web2c_SCRIPTS)'; test -n "$(web2cdir)" || exit 0; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 's,.*/,,;$(transform)'`; \
- dir='$(DESTDIR)$(web2cdir)'; $(am__uninstall_files_from_dir)
-
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -2133,7 +2097,7 @@
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -2261,9 +2225,8 @@
info-am:
-install-data-am: install-data-local install-dist_web2cSCRIPTS \
- install-kpseincludeHEADERS install-nodist_kpseincludeHEADERS \
- install-pkgconfigDATA
+install-data-am: install-data-local install-kpseincludeHEADERS \
+ install-nodist_kpseincludeHEADERS install-pkgconfigDATA
install-dvi: install-dvi-recursive
@@ -2377,10 +2340,9 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cSCRIPTS \
- uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \
- uninstall-local uninstall-nodist_kpseincludeHEADERS \
- uninstall-pkgconfigDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-kpseincludeHEADERS \
+ uninstall-libLTLIBRARIES uninstall-local \
+ uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: $(am__recursive_targets) all check check-am install install-am \
@@ -2396,11 +2358,11 @@
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
- install-data-am install-data-local install-dist_web2cSCRIPTS \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-exec-hook install-exec-local install-html \
- install-html-am install-info install-info-am \
- install-kpseincludeHEADERS install-libLTLIBRARIES install-man \
+ install-data-am install-data-local install-dvi install-dvi-am \
+ install-exec install-exec-am install-exec-hook \
+ install-exec-local install-html install-html-am install-info \
+ install-info-am install-kpseincludeHEADERS \
+ install-libLTLIBRARIES install-man \
install-nodist_kpseincludeHEADERS install-pdf install-pdf-am \
install-pkgconfigDATA install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
@@ -2407,10 +2369,10 @@
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am recheck tags tags-am uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-dist_web2cSCRIPTS \
- uninstall-hook uninstall-kpseincludeHEADERS \
- uninstall-libLTLIBRARIES uninstall-local \
- uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA
+ uninstall-am uninstall-binPROGRAMS uninstall-hook \
+ uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \
+ uninstall-local uninstall-nodist_kpseincludeHEADERS \
+ uninstall-pkgconfigDATA
.PRECIOUS: Makefile
Deleted: trunk/Build/source/texk/kpathsea/mktex.cnf
===================================================================
--- trunk/Build/source/texk/kpathsea/mktex.cnf 2019-12-25 23:16:06 UTC (rev 53234)
+++ trunk/Build/source/texk/kpathsea/mktex.cnf 2019-12-25 23:23:15 UTC (rev 53235)
@@ -1,18 +0,0 @@
-# $Id$
-# Public domain.
-#
-# The mktex.cnf file, if it exists, can be used to tailor a setup to
-# local conditions. If you use the mktex scripts, this file can contain
-# generic Bourne shell code. However, the C (and other possible future)
-# implementations of the scripts do not handle anything beyond simple
-# assignment of variables, and so doing more is not recommended.
-#
-# To assign variables, use constructs like the examples below, which only
-# set unassigned variables. The scripts may malfunction if you do
-# otherwise.
-#
-# Some examples of what you can use the mktex.cnf file for:
-# : ${MT_FEATURES=appendonlydir:varfonts}
-# : ${MODE=ljfour}
-# : ${BDPI=600}
-# : ${ps_to_pk=gsftopk}
Deleted: trunk/Build/source/texk/kpathsea/mktexdir
===================================================================
--- trunk/Build/source/texk/kpathsea/mktexdir 2019-12-25 23:16:06 UTC (rev 53234)
+++ trunk/Build/source/texk/kpathsea/mktexdir 2019-12-25 23:23:15 UTC (rev 53235)
@@ -1,76 +0,0 @@
-#!/bin/sh
-# mktexdir (was mkinstalldirs) -- make directory hierarchy.
-# Author: Noah Friedman <friedman at prep.ai.mit.edu>, created: 1993-05-16.
-# Public domain.
-#
-# Modified for sticky directory creation, --help, --version, more,
-# by Thomas Esser, Karl Berry, Olaf Weber, et al.
-# Maintained as part of TeX Live, http://tug.org/tex-live.
-
-version='$Id$'
-progname=`echo $0 | sed 's%.*/%%'`
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $0 DIR...
- Create each DIR, including any missing leading directories."
-mt_max_args=$#
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
- echo "$0: Cannot find mktex.opt; check your installation." >&2
- exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-test -n "$MT_MKTEXDIR_OPT" && . "$MT_MKTEXDIR_OPT"
-
-test -z "$MT_APPEND_MASK" && MT_APPEND_MASK="="
-
-errstatus=0
-
-for file
-do
- case $file in
- /*) cd /;;
- *) cd $KPSE_DOT;;
- esac
- OLDIFS=$IFS; IFS=/; set fnord `echo "./$file"`; IFS=$OLDIFS; shift
-
- pathcomp=
- for d
- do
- test -z "$d" && continue
- pathcomp="$pathcomp$d"
-
- if test ! -d "./$pathcomp"; then
- # This shell stuff is not atomic, therefore ./$pathcomp
- # may have been created in another process and this mkdir will
- # fail despite the above test, so do it silently:
- mkdir "./$pathcomp" >/dev/null 2>&1
-
- # So, if ./$pathcomp is a directory now, call it good.
- if test ! -d "./$pathcomp"; then
- # Otherwise, presumably it's a real error. Do the mkdir again
- # and let the error be seen, and quit the loop.
- # (Report at https://bugs.debian.org/794228.)
- mkdir "./$pathcomp" || { errstatus=$?; break; }
- fi
- chmod `kpsestat ${MT_APPEND_MASK} "$pathcomp"/..` "./$pathcomp"
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# P.S. We don't want to rely on mkdir -p, because of possible
-# portability programs. See current mkinstalldirs source (in Automake).
Deleted: trunk/Build/source/texk/kpathsea/mktexnam
===================================================================
--- trunk/Build/source/texk/kpathsea/mktexnam 2019-12-25 23:16:06 UTC (rev 53234)
+++ trunk/Build/source/texk/kpathsea/mktexnam 2019-12-25 23:23:15 UTC (rev 53235)
@@ -1,229 +0,0 @@
-#!/bin/sh
-# maketexnam -- find PK and TFM names.
-# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
-# Public domain.
-
-version='$Id$'
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $0 NAME [DPI MODE] [DESTDIR].
- Output the PK, TFM, and MF names for a font NAME.
-
-Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
-"
-mt_max_args=4
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
- echo "$0: Cannot find mktex.opt; check your installation." >&2
- exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-NAME=$1
-case $# in
- 1|2) DPI=$BDPI; DEST=$2;;
- 3|4) DPI=$2; MODE=$3; DEST=$4;;
- *) help;;
-esac
-
-: ${MT_PKDESTDIR='$MT_DESTROOT/$MT_PKDESTREL'}
-: ${MT_TFMDESTDIR='$MT_DESTROOT/$MT_TFMDESTREL'}
-: ${MT_MFDESTDIR='$MT_DESTROOT/$MT_MFDESTREL'}
-: ${MT_PKBASE='$NAME.${DPI}pk'}
-: ${MT_TFMBASE='$NAME.tfm'}
-: ${MT_MFBASE='$NAME.mf'}
-: ${MT_DEFAULT_SUPPLIER=unknown}
-: ${MT_DEFAULT_TYPEFACE=unknown}
-: ${MT_DEFAULT_NAMEPART='$MT_SUPPLIER/$MT_TYPEFACE'}
-: ${MT_DEFAULT_PKDESTREL='pk/modeless/$MT_NAMEPART'}
-: ${MT_DEFAULT_TFMDESTREL='tfm/$MT_NAMEPART'}
-: ${MT_DEFAULT_MFDESTREL='source/$MT_NAMEPART'}
-: ${MT_DEFAULT_DESTROOT=$KPSE_DOT}
-
-# Find the font: test tfm first, then mf, then possible sauterized mf.
-fullname=`kpsewhich "$NAME.tfm" 2>/dev/null`
-test -z "$fullname" && fullname=`kpsewhich "$NAME.mf" 2>/dev/null`
-if test -z "$fullname"; then
- rootname=`echo $NAME | sed 's/[0-9]*$//'`
- fullname=`kpsewhich "b-$rootname.mf" 2>/dev/null`
- # LH fonts get special treatment:
- if test -z "$fullname"; then
- case $rootname in
- # Czech/Slovak fonts get special treatment:
- cs*|lcsss*|icscsc*|icstt*|ilcsss*)
- fullname=`kpsewhich cscode.mf`
- ;;
- # LH fonts get special treatment:
- wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
- lhprefix=`echo $NAME | sed 's/^\(..\).*/\1/'`
- fullname=`kpsewhich "${lhprefix}codes.mf" 2>/dev/null`;;
- *) fullname=`kpsewhich "$rootname.mf" 2>/dev/null`
- ;;
- esac
- fi
-fi
-
-# After all this, do we _have_ a font?
-if test -z "$fullname"; then
- : ${MT_DESTROOT="$MT_VARTEXFONTS"}
-else
- # Normalize $fullname.
- fullname=`echo "$fullname" | sed 's%//*%/%g'`
- # See if $fullname comes from a standard location.
- OIFS=$IFS;IFS=$SEP
- set x `kpsewhich --expand-path='$TEXMF/fonts'"$SEP$MT_VARTEXFONTS"`
- shift; IFS=$OIFS
- for i
- do
- test -z "$i" && continue
- case "$fullname" in
- $i/*)
- # We now have a preliminary value for the destination root.
- : ${MT_DESTROOT="$i"}
- # When we're done, relfmt contains one of these:
- # "/source/$MT_NAMEPART/"
- # "/$MT_NAMEPART/source/"
- # while namepart contains the actual namepart.
- relfmt=`echo "$fullname" | \
- sed -e 's%^'"$i"'\(/.*/\)[^/]*$%\1%' \
- -e 's%^/tfm/%/source/%' \
- -e 's%/tfm/$%/source/%'`
- namepart=`echo "$relfmt" | sed -e 's%/source/%/%'`
- # See if namepart is empty.
- if test "$namepart" != "/"; then
- relfmt=`echo "$relfmt" | \
- sed -e 's%'"$namepart"'%/$MT_NAMEPART/%'`
- else
- # Assume TDS.
- relfmt='/source/$MT_NAMEPART/'
- namepart=''
- fi
- # Determine supplier and typeface from namepart. If there is
- # only one part in the namepart, we take it to be the typeface.
- MT_SUPPLIER=`echo $namepart | sed 's%^/\([^/]*\)/\(.*\)$%\1%'`
- MT_TYPEFACE=`echo $namepart | sed 's%^/\([^/]*\)/\(.*\)$%\2%'`
- if test -z "$MT_TYPEFACE"; then
- MT_TYPEFACE="$MT_SUPPLIER";
- MT_SUPPLIER=''
- fi
- # Phew. Now we create the relative paths for pk, tfm and source.
- : ${MT_NAMEPART='$MT_SUPPLIER/$MT_TYPEFACE'}
- : ${MT_PKDESTREL=`echo "$relfmt" | sed 's%/source/%/pk/$MT_MODE/%'`}
- : ${MT_TFMDESTREL=`echo "$relfmt" | sed 's%/source/%/tfm/%'`}
- : ${MT_MFDESTREL=`echo "$relfmt"`}
- break
- esac
- done
-fi
-
-# In case some variables remain unset.
-: ${MT_SUPPLIER=$MT_DEFAULT_SUPPLIER}
-: ${MT_TYPEFACE=$MT_DEFAULT_TYPEFACE}
-: ${MT_NAMEPART=$MT_DEFAULT_NAMEPART}
-: ${MT_PKDESTREL=$MT_DEFAULT_PKDESTREL}
-: ${MT_TFMDESTREL=$MT_DEFAULT_TFMDESTREL}
-: ${MT_MFDESTREL=$MT_DEFAULT_MFDESTREL}
-
-# We have found nothing, so force using the fontmaps as a last resort.
-# This also means mktexnam can be queried for advice on where to
-# place fonts.
-if test "x$MT_SUPPLIER" = xunknown \
- || test "x$MT_TYPEFACE" = xunknown; then
- MT_FEATURES="$MT_FEATURES:fontmaps"
-fi
-
-# Handle the options.
-test -n "$MT_MKTEXNAM_OPT" && . "$MT_MKTEXNAM_OPT"
-
-# Adjust MT_DESTROOT, if necessary.
-if test -n "${MT_DESTROOT}"; then
- # We distinguish system trees from the rest.
- systexmf="`kpsewhich --expand-path='{$SYSTEXMF}/fonts'`$SEP$MT_VARTEXFONTS"
- case "$SEP$systexmf$SEP" in
- *$SEP$MT_DESTROOT$SEP*) # A system tree.
- # If the texmfvar option is set, use TEXMFVAR tree.
- # Some additional uglyness handles the case where $TEXMFVAR exists
- # but $TEXMFVAR/fonts doesn't (yet).
- if test "x$USE_TEXMFVAR" = x1; then
- : ${MT_TEXMFVAR=`kpsewhich --var-value=TEXMFVAR`}
- MT_DESTROOT=$MT_TEXMFVAR/fonts
- if test -z "$MT_TEXMFVAR"; then
- # Path expansion of $TEXMFVAR was empty.
- FALLBACK=1
- elif test -d "$MT_DESTROOT"; then
- # Do we have write access and permission?
- kpseaccess -w "$MT_DESTROOT" || FALLBACK=1
- test -w "$MT_DESTROOT" || FALLBACK=1
- elif test -d "$MT_TEXMFVAR"; then
- # De we have write access and permission?
- kpseaccess -w "$MT_TEXMFVAR" || FALLBACK=1
- test -w "$MT_TEXMFVAR" || FALLBACK=1
- elif test -e "$MT_TEXMFVAR"; then
- # TEXMFVAR defined and exists, but it is not a directory?
- FALLBACK=1
- else
- # TEXMFVAR defined but does not exist, try to create it
- MT_FEATURES=none "$MT_MKTEXDIR" "$MT_TEXMFVAR" || FALLBACK=1
- fi
- else
- # Do we have write access and permission?
- kpseaccess -w "$MT_DESTROOT" || FALLBACK=1
- test -w "$MT_DESTROOT" || FALLBACK=1
- fi
- # Fall back on VARTEXFONTS if the varfonts option is set, or
- # we cannot write in the given tree.
- if test "x$USE_VARTEXFONTS" = x1 || test "x$FALLBACK" = x1; then
- MT_DESTROOT=$MT_VARTEXFONTS
- fi ;;
- *) # A non-system tree.
- # Do we have write access and permission?
- kpseaccess -w "$MT_DESTROOT" || FALLBACK=1
- test -w "$MT_DESTROOT" || FALLBACK=1
- # If we cannot write fall back of defaults.
- test "x$FALLBACK" = x1 && MT_DESTROOT=;;
- esac
-fi
-
-if test -z "$MT_DESTROOT"; then
- MT_DESTROOT=$MT_DEFAULT_DESTROOT
- MT_PKDESTDIR=$MT_DEFAULT_DESTROOT
- MT_TFMDESTDIR=$MT_DEFAULT_DESTROOT
- MT_MFDESTDIR=$MT_DEFAULT_DESTROOT
-fi
-
-case "$DEST" in
- "") ;;
- /* | [A-z]:/*) # Absolute, explicit destdir => use it.
- MT_PKDESTDIR=$DEST
- MT_TFMDESTDIR=$DEST
- MT_MFDESTDIR=$DEST
- MT_NAMEPART=;;
- *) # Relative destdir => append to the default.
- MT_NAMEPART=$DEST;;
-esac
-
-eval MT_MODE=\"$MODE\"
-eval MT_NAMEPART=\"$MT_NAMEPART\"
-eval MT_DESTROOT=\"$MT_DESTROOT\"
-eval MT_PKDESTREL=\"$MT_PKDESTREL\"
-eval MT_TFMDESTREL=\"$MT_TFMDESTREL\"
-eval MT_MFDESTREL=\"$MT_MFDESTREL\"
-eval MT_PKDESTDIR=\"$MT_PKDESTDIR\"
-eval MT_TFMDESTDIR=\"$MT_TFMDESTDIR\"
-eval MT_MFDESTDIR=\"$MT_MFDESTDIR\"
-eval MT_PKNAME=\"$MT_PKDESTDIR/$MT_PKBASE\"
-eval MT_TFMNAME=\"$MT_TFMDESTDIR/$MT_TFMBASE\"
-eval MT_MFNAME=\"$MT_MFDESTDIR/$MT_MFBASE\"
-
-echo "$MT_PKNAME$SEP$MT_TFMNAME$SEP$MT_MFNAME" | sed 's%//*%/%g'
-
Deleted: trunk/Build/source/texk/kpathsea/mktexupd
===================================================================
--- trunk/Build/source/texk/kpathsea/mktexupd 2019-12-25 23:16:06 UTC (rev 53234)
+++ trunk/Build/source/texk/kpathsea/mktexupd 2019-12-25 23:23:15 UTC (rev 53235)
@@ -1,69 +0,0 @@
-#!/bin/sh
-# mktexupd -- update ls-R with a new entry.
-#
-# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
-# Public domain.
-
-version='$Id$'
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $0 DIR FILE.
- Update the ls-R file with an entry for FILE in DIR.
-
-Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
-"
-mt_min_args=2
-mt_max_args=2
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
- echo "$0: Cannot find mktex.opt; check your installation." >&2
- exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-dir=$1
-file=$2
-test -d "$dir" || { echo "$0: $dir not a directory." >&2; exit 1; }
-test -f "$dir/$file" || { echo "$0: $dir/$file not a file." >&2; exit 1; }
-
-OIFS=$IFS; IFS=$SEP; set x `kpsewhich -show-path=ls-R`; shift; IFS=$OIFS
-TEXMFLS_R=
-for d in "$@"; do
- case $dir in
- "") continue;;
- ${d}|${d}/*) TEXMFLS_R="$d"; break;;
- esac
-done
-test -n "$TEXMFLS_R" || exit 0
-db_file="$TEXMFLS_R/ls-R"
-db_file_lc="$TEXMFLS_R/ls-r"
-
-test ! -f "$db_file" && test -f "$db_file_lc" && db_file="$db_file_lc"
-test -f "$db_file" || { mktexlsr "$TEXMFLS_R"; exit; }
-test -w "$db_file" || { echo "$0: $db_file unwritable." >&2; exit 1; }
-
-test "x`sed '1s/
-$//;1q' \"$db_file\"`" = "x$ls_R_magic" \
- || test "x`sed '1s/
-$//;1q' \"$db_file\"`" = "x$old_ls_R_magic" \
- || { echo "$0: $db_file lacks magic string \`$ls_R_magic'." >&2; exit 1; }
-
-# Change `$TEXMFLS_R/' to `./'.
-dir=`echo $dir | sed "s%^$TEXMFLS_R/%./%g"`
-
-# May as well always put in a new directory entry; presumably cron will
-# come along soon enough and clean things up.
-echo "$dir:" >>"$db_file"
-echo "$file" >>"$db_file"
-
-exit 0
More information about the tex-live-commits
mailing list