diff options
author | Karl Berry <karl@freefriends.org> | 2018-09-03 17:46:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-09-03 17:46:06 +0000 |
commit | 5b6d00a6ba4e9c36af0332f236ce06f7fe2d4c86 (patch) | |
tree | 610c0a3926869363fa402a545b79e89fdf663265 /Master | |
parent | e92f337e45b54c32ad4c6b8717f2c5427e88381b (diff) |
doc, wording
git-svn-id: svn://tug.org/texlive/trunk@48560 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/install-tl | 26 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/texlive/NEWS | 3 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-try-install | 4 | ||||
-rw-r--r-- | Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt | 19 |
4 files changed, 36 insertions, 16 deletions
diff --git a/Master/install-tl b/Master/install-tl index 7657e1e8dad..cee1bad9d3d 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -972,6 +972,7 @@ sub run_postinst_cmd { # Make texmf.cnf, backup directory, cleanups, path setting, and # (most importantly) post-install subprograms: mktexlsr, fmtutil, # and more. Return count of errors detected, hopefully zero. +# sub do_postinst_stuff { my $TEXDIR = "$vars{'TEXDIR'}"; my $TEXMFSYSVAR = "$vars{'TEXMFSYSVAR'}"; @@ -1472,10 +1473,10 @@ sub set_standard_var { # via env var my $envvar = getenv($envstr); if ($vars{$what} && $envvar && $vars{$what} ne $envvar) { - tlwarn("Trying to define $what via conflicting settings\n"); - tlwarn(" from profile: " . $vars{$what} . "\n"); - tlwarn(" from envvar: $envvar ($envstr)\n"); - tlwarn("Preferring the profile variable!\n"); + tlwarn("Trying to define $what via conflicting settings:\n"); + tlwarn(" from envvar $envvar = $envvar($envstr)\n"); + tlwarn(" from profile = $vars{$what}\n"); + tlwarn(" Preferring the profile value!\n"); $envvar = undef; } # default for most variables is in increasing priority @@ -1496,10 +1497,10 @@ sub set_texlive_default_dirs { if ($tlprefixenv && $vars{'TEXDIR'}) { # NOTE we cannot compare these two values because the one might # contain the YYYY part (TEXDIR) while the other is the one without. - tlwarn("Trying to setup basic path using two incompatible methods\n"); - tlwarn(" from profile: " . $vars{'TEXDIR'} . "\n"); - tlwarn(" from envvar: $tlprefixenv ('TEXLIVE_INSTALL_PREFIX')\n"); - tlwarn("Preferring the profile variable!\n"); + tlwarn("Trying to set up basic path using two incompatible methods:\n"); + tlwarn(" from envvar TEXLIVE_INSTALL_PREFIX = $tlprefixenv\n"); + tlwarn(" from profile TEXDIR = $vars{'TEXDIR'}\n"); + tlwarn(" Preferring the profile value!\n"); $tlprefixenv = undef; } # first set $tex_prefix @@ -2738,9 +2739,9 @@ installer interfaces. USE AT YOUR OWN RISK. =item B<-init-from-profile> I<profile_file> -Similar to B<-profile> (see L</PROFILES> below), but only initializes the -installation configuration from I<profile_file> and then starts the -interactive session. +Similar to B<-profile> (see L</PROFILES> below), but only initializes +the installation configuration from I<profile_file> and then starts a +normal interactive session. Environment variables are not ignored. =item B<-logfile> I<file> @@ -2797,7 +2798,8 @@ C<-print-arch> is a synonym. =item B<-profile> I<profile_file> Load I<profile_file> and do the installation with no user interaction, -that is, a batch (unattended) install. See L</PROFILES> below. +that is, a batch (unattended) install. Environment variables are +ignored. See L</PROFILES> below. =item B<-q> diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS index 7cb4852ffe6..5d89b26fa76 100644 --- a/Master/texmf-dist/scripts/texlive/NEWS +++ b/Master/texmf-dist/scripts/texlive/NEWS @@ -1,8 +1,9 @@ (This file public domain. Originally written by Norbert Preining and Karl Berry, 2010.) -<li>only run mtxrun if luatex is available. +<p><b>tlmgr 48522 (released 3sep18):</b> <li>tlmgr info: report Catalogue contact info if available. +<li>only run mtxrun if luatex is available. <p><b>tlmgr 48271 (released 25jul18):</b> <li>prefer system provided binaries over TL provided binaries for diff --git a/Master/tlpkg/bin/tl-try-install b/Master/tlpkg/bin/tl-try-install index 7439427d4ab..bc940d71efa 100755 --- a/Master/tlpkg/bin/tl-try-install +++ b/Master/tlpkg/bin/tl-try-install @@ -1,4 +1,4 @@ -#!/bin/sh -vx +#!/bin/sh -x # $Id$ # Try a TL installation with various profiles into /tmp/ki. Public domain. @@ -23,7 +23,7 @@ PATH=/usr/local/bin:/usr/bin:/bin # /usr/local/bin for good perl on tug thisrel=/usr/local/texlive/`date +%Y` # not necessarily, but whatever prevrel=/usr/local/texlive/`expr "$(date +%Y)" - 1` -pro=--profile=${1-Master/tlpkg/dev/profiles/TLinfra.pro} #infra min ... full +pro=--profile=${1-$Master/tlpkg/dev/profiles/TLinfra.pro} #infra min ... full exec time $Master/install-tl $pro exec time $lp/install-tl $pro exec time $lp/install-tl $pro --repo ftp://ftp.cstug.cz/pub/tex/local/tlpretest diff --git a/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt b/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt index 3a755d27e5a..913dc6a5b6f 100644 --- a/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt +++ b/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt @@ -1,17 +1,34 @@ +$Id$ +Public domain. + + Steps to extend TL signing key ============================== +This needs to happen every year in August (--list-keys for actual expiration). * get main key dir from USB stick + * set GNUPGHOME to the respective directory + * gpg1 --edit-key 0x0D5E5D9106BAB6BC key 2 # select signing sub key expire 1y save + * export signing key gpg1 --export 0x0D5E5D9106BAB6BC > tmpkey + * send to key server - gpg1 --keyserver hkp://pool.sks-keyservers.net --send-key 06BAB6B + gpg1 --keyserver hkp://pool.sks-keyservers.net \ + --send-key 0x0D5E5D9106BAB6BC + * import into TL subversion gpg1 --homedir .../Master/tlpkg/gpg --import tmpkey + +* on the TL side + gpg --homedir ~texlive/etc \ + --keyserver hkp://pool.sks-keyservers.net \ + --recv-key 0x0D5E5D9106BAB6BC + * after testing push out tlcritical |