diff options
Diffstat (limited to 'Master/tlpkg/TeXLive')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 761a85fcd11..962737897dc 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -565,7 +565,7 @@ from the return value. =cut -#taken from File/Path.pm +#taken from File/Path.pm # my $Is_VMS = $^O eq 'VMS'; my $Is_MacOS = $^O eq 'MacOS'; @@ -602,7 +602,7 @@ sub rmtree { if ( -d _ ) { # notabene: 0700 is for making readable in the first place, # it's also intended to change it to writable in case we have - # to recurse in which case we are better than rm -rf for + # to recurse in which case we are better than rm -rf for # subtrees with strange permissions chmod($rp | 0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) or warn "Can't make directory $root read+writeable: $!" @@ -622,7 +622,7 @@ sub rmtree { @files = (); } # Deleting large numbers of files from VMS Files-11 filesystems - # is faster if done in reverse ASCIIbetical order + # is faster if done in reverse ASCIIbetical order @files = reverse @files if $Is_VMS; ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS; if ($Is_MacOS) { @@ -648,7 +648,7 @@ sub rmtree { or warn("and can't restore permissions to " . sprintf("0%o",$rp) . "\n"); } - } else { + } else { if ($safe && ($Is_VMS ? !&VMS::Filespec::candelete($root) : !(-l $root || -w $root))) @@ -851,7 +851,7 @@ sub install_packages { This function installs the files given in @$filelistref from C<$what> into C<$target>. -C<$size> gives the size in bytes of the container, or -1 if we are +C<$size> gives the size in bytes of the container, or -1 if we are installing from DVD, i.e., from a list of files to be copied. If C<$what> is a reference to a list of files then these files are @@ -863,7 +863,7 @@ If C<$what> starts with C<http://> or C<ftp://> then C<$what> is downloaded from the net and piped through c<lzmadec> and C<tar>. If $what ends with C<.tar.lzma> (but does not start with C<http://> or -C<ftp://>, but possibly with C<file:/>) it is assumed to be a readable +C<ftp://>, but possibly with C<file:/>) it is assumed to be a readable file on the system and is piped through C<lzmadec> and C<tar> in the very same way. @@ -1009,7 +1009,7 @@ sub setup_programs { if (!defined($platform) || ($platform eq "")) { # we assume that we run from the DVD, so we can call platform() and # thus also the config.guess script - # but we have to setup $::installerdir because the platform script + # but we have to setup $::installerdir because the platform script # relies on it $::installerdir = "$bindir/../.."; $platform = platform(); @@ -1190,7 +1190,7 @@ sub make_local_skeleton { =item C<create_language_def($tlpdb, $dest, $localconf)> -These four functions create C<fmtutil.cnf>, C<updmap.cfg>, C<language.dat>, +These four functions create C<fmtutil.cnf>, C<updmap.cfg>, C<language.dat>, and C<language.def> respectively, in C<$dest> (which by default is below C<$TEXMFSYSVAR>). These functions merge the information present in the TLPDB C<$tlpdb> (formats, maps, hyphenations) with local configuration @@ -1207,7 +1207,7 @@ sub create_fmtutil { my @lines = $tlpdb->fmtutil_cnf_lines; _create_config_files ($tlpdb, "texmf/fmtutil/fmtutil-hdr.cnf", $dest, $localconf, 0, '#', \@lines); } - + sub create_updmap { my ($tlpdb,$dest,$localconf) = @_; my @lines = $tlpdb->updmap_cfg_lines; @@ -1505,7 +1505,7 @@ C<-v -v -v>, are accepted but ignored. Write both all messages (informational, debugging, warnings) to I<file>, in addition to standard output or standard error. In TeX Live, only the installer sets a log file by default, none of other the standard TeX -Live scripts use this feature. +Live scripts use this feature. =back @@ -1522,7 +1522,7 @@ sub process_logging_options { # do not report errors my $oldconfig = Getopt::Long::Configure(qw(pass_through permute)); GetOptions("logfile=s" => \$opt_logfile, - "v+" => \$::opt_verbosity, + "v+" => \$::opt_verbosity, "q" => \$::opt_quiet); Getopt::Long::Configure($oldconfig); if ($opt_logfile) { @@ -1578,8 +1578,8 @@ EOF =item C<welcome> -The same welcome message as above but with hints about C<PATH>, C<MANPATH>, -and C<INFOPATH>. +The same welcome message as above but with hints about C<PATH>, C<MANPATH>, +and C<INFOPATH>. =cut @@ -1590,11 +1590,18 @@ sub welcome_paths { (http://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; - please consider supporting it by joining the group best for you. The + please consider supporting it by joining the group best for you. The list of groups is available on the web at http://tug.org/usergroups.html. Add $::vars{'TEXDIR'}/texmf/doc/man to MANPATH. Add $::vars{'TEXDIR'}/texmf/doc/info to INFOPATH. +EOF + if ($::vars{'from_dvd'} and !win32()) { + $welcome .= <<"EOF"; + Set TEXMFCNF to $::vars{'TEXMFSYSVAR'}/web2c. +EOF +} + $welcome .= <<"EOF"; Most importantly, add $::vars{'TEXDIR'}/bin/$::vars{'this_platform'} to your PATH for current and future sessions. @@ -1635,7 +1642,7 @@ sub give_ctan_mirror $wget = "wget"; } - my $cmd = "$wget $TeXLiveServerURL -O " + my $cmd = "$wget $TeXLiveServerURL -O " . (win32() ? "nul" : "/dev/null") . " 2>&1"; my @out = `$cmd`; # now analyze the output |