diff options
author | Karl Berry <karl@freefriends.org> | 2024-05-02 17:03:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-05-02 17:03:11 +0000 |
commit | 5fd3248d090b6f847f303255e30523195155fe0f (patch) | |
tree | 423637d0ea094f8f4c1e3c8bbc35e2c6230a0ad5 | |
parent | 04907b0f8cdb2662b6565b7ae00dfbd3fb5cbf6c (diff) |
check for cygwin curl or wget
git-svn-id: svn://tug.org/texlive/trunk@71152 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/install-tl | 28 | ||||
-rw-r--r-- | Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html | 15 | ||||
-rw-r--r-- | Master/texmf-dist/doc/texlive/texlive-en/texlive-en.pdf | bin | 1061892 -> 1061966 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex | 12 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLDownload.pm | 1 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 9 |
7 files changed, 44 insertions, 23 deletions
diff --git a/Master/install-tl b/Master/install-tl index ed6638a9863..a03b085cd44 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -361,16 +361,13 @@ my %profiledata; if (-r "installation.profile" && $opt_interaction && !exists $ENV{"TEXLIVE_INSTALL_NO_RESUME"}) { - if ($from_ext_gui) { # prepare for dialog interaction - print "mess_yesno\n"; - } + print "mess_yesno\n" if $from_ext_gui; # prepare for dialog interaction my $pwd = Cwd::getcwd(); print "ABORTED TL INSTALLATION FOUND: installation.profile (in $pwd)\n"; - print - "Do you want to continue with the exact same settings as before (y/N): "; + print "Do you want to continue with the same settings as before (y/N): "; print "\nendmess\n" if $from_ext_gui; my $answer = <STDIN>; - if ($answer =~ m/^y(es)?$/i) { + if ($answer && $answer =~ m/^y(es)?$/i) { $opt_profile = "installation.profile"; } } @@ -601,6 +598,25 @@ if (!$opt_custom_bin && (platform() eq "i386-cygwin")) { } } } +# +# More Cygwin: if the user doesn't have Cygwin's wget or curl, +# it's unlikely anything good will happen. +if ($^O eq 'cygwin' + && (! -x "/usr/bin/curl.exe" || ! -x "/usr/bin/wget.exe")) { + print "mess_yesno\n" if $from_ext_gui; # prepare for dialog interaction + print <<END_CYGWIN_WGET_MSG; +It seems you are using Cygwin and have not installed Cygwin's +curl or wget. See the TeX Live Guide information on Cygwin for required +and recommended packages: + https://tug.org/texlive/doc/texlive-en/texlive-en.html#cygwin +END_CYGWIN_WGET_MSG + print "Continue anyway (unlikely to work) (y/N): "; + print "\nendmess\n" if $from_ext_gui; + my $answer = <STDIN>; + if (! $answer || $answer !~ m/^y(es)?$/i) { + tldie("$0: Ok, goodbye. Please install the needed packages.\n"); + } +} # determine which media are available, don't put NET here, it is # assumed to be available at any time diff --git a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css index 2a3a941e60a..30bf1376101 100644 --- a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css +++ b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css @@ -203,6 +203,7 @@ h1,h2,h3,h4,h5 { line-height:1.2; } .subsectionHead, .likesubsectionHead { font-size: 1.3195em; } .subsubsectionHead, .likesubsubsectionHead { font-size: 1.1487em; } @media (prefers-color-scheme: dark) { img[src^="texlive-en"]{filter: invert(1); } } + body { background-color: Canvas; color: CanvasText; color-scheme: light dark; } li p.indent { text-indent: 0em } li p:first-child{ margin-top:0em; } li p:last-child, li div:last-child { margin-bottom:0.5em; } @@ -354,6 +355,7 @@ span.uwave, .uwave-math {text-decoration:underline wavy; } span.dashuline, .dashuline-math {text-decoration:underline dashed;} span.dotuline, .dotuline-math {text-decoration:underline dotted;} pre.fancyvrb {white-space: pre-wrap; margin:0em;font-family:monospace,monospace;} +.textls{letter-spacing:0.1rem;} pre#fancyvrb1{ border-top: solid 0.4pt; } pre#fancyvrb1{ border-left: solid 0.4pt; } pre#fancyvrb1{ border-bottom: solid 0.4pt; } diff --git a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html index b2ac18e8657..c0988d9b605 100644 --- a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html +++ b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html @@ -24,7 +24,7 @@ class="ec-lmr-12x-x-120">Karl Berry, editor</span> href="https://tug.org/texlive/" class="url" ><span class="ec-lmtt-12x-x-120">https://tug.org/texlive/</span></a> </div><br /> <div class="date" ><span -class="ec-lmr-12x-x-120">24 March 2024</span></div> +class="ec-lmr-12x-x-120">2 May 2024</span></div> </div> <h3 class="likesectionHead"><a id="x1-1000"></a>Contents</h3> @@ -644,8 +644,8 @@ class="list"> <span class="ec-lmtt-12">TEXMFCONFIG</span> </dt><dd class="list"> - <!--l. 310--><p class="noindent" >The (personal) tree used by the utilities <span class="obeylines-h"><code class="verb">texconfig</code></span>, <span class="obeylines-h"><code class="verb">updmap-sys</code></span>, and <span class="obeylines-h"><code class="verb">fmtutil-sys</code></span> - to store modified configuration data. + <!--l. 310--><p class="noindent" >The (personal) tree used by the utilities <span class="obeylines-h"><code class="verb">texconfig</code></span>, <span class="obeylines-h"><code class="verb">updmap-user</code></span>, and + <span class="obeylines-h"><code class="verb">fmtutil-user</code></span> to store modified configuration data. </p></dd><dt class="list"> <span class="ec-lmtt-12">TEXMFCACHE</span> </dt><dd @@ -1080,7 +1080,7 @@ class="ec-lmtt-12">umask</span>, consult your system documentation. class="ec-lmbx-12">Special considerations for Cygwin: </span>Unlike other Unix-compatible systems, Cygwin does not by default include all of the prerequisite programs needed by the TeX Live installer. See section <a -href="#x1-190003.1.4">3.1.4<!--tex4ht:ref: sec:cygwin --></a>. +href="#x1-190003.1.4">3.1.4<!--tex4ht:ref: sec:cygwin --></a> for the packages which you need to install first. </p><!--l. 545--><p class="noindent" > @@ -1401,9 +1401,10 @@ class="content">Advanced GUI installer screen (GNU/Linux)</span></figcaption><!- <!--l. 657--><p class="noindent" >Before beginning the installation, use Cygwin’s <span class="ec-lmtt-12">setup.exe </span>program to install the <span class="ec-lmtt-12">perl </span>and -<span -class="ec-lmtt-12">wget </span>packages if you have not already done so. The following additional packages are -recommended: </p> +either <span +class="ec-lmtt-12">curl </span>or <span +class="ec-lmtt-12">wget </span>packages if you have not already done so. The following additional +packages are recommended: </p> <ul class="itemize1"> <li class="itemize"> <!--l. 662--><p class="noindent" ><span diff --git a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.pdf b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.pdf Binary files differindex 294b98e2508..d827c34a1aa 100644 --- a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.pdf +++ b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.pdf diff --git a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex index 70bb6802c06..bbe973c8253 100644 --- a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex +++ b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex @@ -19,7 +19,7 @@ \url{https://tug.org/texlive/} } -\date{21 April 2024} +\date{2 May 2024} \begin{document} \maketitle @@ -539,7 +539,7 @@ documentation. \textbf{Special considerations for Cygwin:} Unlike other Unix-compatible systems, Cygwin does not by default include all of the prerequisite programs needed by the \TL{} installer. See -section~\ref{sec:cygwin}. +section~\ref{sec:cygwin} for the packages which you need to install first. \subsubsection{\macOS} @@ -654,10 +654,10 @@ Actions: \subsubsection{Cygwin} \label{sec:cygwin} -Before beginning the installation, use Cygwin's \filename{setup.exe} program to -install the \filename{perl} and \filename{wget} packages if you have -not already done so. The following additional packages are -recommended: +Before beginning the installation, use Cygwin's \filename{setup.exe} +program to install the \filename{perl} and either \filename{curl} or +\filename{wget} packages if you have not already done so. The following +additional packages are recommended: \begin{itemize*} \item \filename{fontconfig} [needed by \XeTeX\ and Lua\TeX] \item \filename{ghostscript} [needed by various utilities] diff --git a/Master/tlpkg/TeXLive/TLDownload.pm b/Master/tlpkg/TeXLive/TLDownload.pm index 47f6539df0a..96d233b8fb4 100644 --- a/Master/tlpkg/TeXLive/TLDownload.pm +++ b/Master/tlpkg/TeXLive/TLDownload.pm @@ -60,6 +60,7 @@ sub reinit { # differing case-insensitive like foo=1 and FOO=2. Even on systems # that have case-sensitive environments, and even about variables that # have nothing whatsoever to do with LWP (like foo). + # https://github.com/libwww-perl/libwww-perl/issues/372 # # So, only pass env_proxy=>1 when creating the UserAgent if there are # in fact *_proxy variables (case-insensitive, just in case) set in diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 0238428499e..614c822a3f8 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -369,12 +369,13 @@ More info: https://tug.org/texlive/acquire.html END_DOWNLOAD_FAILURE_MSG # If they have the Cygwin wget.exe, some other problem. - if ($^O eq 'cygwin' && -x "/usr/bin/wget.exe") { + if ($^O eq 'cygwin' + && (! -x "/usr/bin/curl.exe" || ! -x "/usr/bin/wget.exe")) { $diemsg .= <<END_CYGWIN_WGET_MSG; -It seems you are using Cygwin and haven't installed Cygwin's wget. -See the TeX Live Guide information on Cygwin for required and -recommended packages: +It seems you are using Cygwin and have not installed Cygwin's +curl or wget. See the TeX Live Guide information on Cygwin for required +and recommended packages: https://tug.org/texlive/doc/texlive-en/texlive-en.html#cygwin END_CYGWIN_WGET_MSG } |