texlive[71152] Master: check for cygwin curl or wget
commits+karl at tug.org
commits+karl at tug.org
Thu May 2 19:03:12 CEST 2024
Revision: 71152
https://tug.org/svn/texlive?view=revision&revision=71152
Author: karl
Date: 2024-05-02 19:03:11 +0200 (Thu, 02 May 2024)
Log Message:
-----------
check for cygwin curl or wget
Modified Paths:
--------------
trunk/Master/install-tl
trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css
trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html
trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.pdf
trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex
trunk/Master/tlpkg/TeXLive/TLDownload.pm
trunk/Master/tlpkg/TeXLive/TLPDB.pm
Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl 2024-05-02 00:02:54 UTC (rev 71151)
+++ trunk/Master/install-tl 2024-05-02 17:03:11 UTC (rev 71152)
@@ -361,16 +361,13 @@
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 @@
}
}
}
+#
+# 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
Modified: trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css
===================================================================
--- trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css 2024-05-02 00:02:54 UTC (rev 71151)
+++ trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.css 2024-05-02 17:03:11 UTC (rev 71152)
@@ -203,6 +203,7 @@
.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.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; }
Modified: trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html
===================================================================
--- trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html 2024-05-02 00:02:54 UTC (rev 71151)
+++ trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.html 2024-05-02 17:03:11 UTC (rev 71152)
@@ -24,7 +24,7 @@
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 @@
<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-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 @@
<!--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
Modified: trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex 2024-05-02 00:02:54 UTC (rev 71151)
+++ trunk/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex 2024-05-02 17:03:11 UTC (rev 71152)
@@ -19,7 +19,7 @@
\url{https://tug.org/texlive/}
}
-\date{21 April 2024}
+\date{2 May 2024}
\begin{document}
\maketitle
@@ -539,7 +539,7 @@
\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 @@
\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]
Modified: trunk/Master/tlpkg/TeXLive/TLDownload.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLDownload.pm 2024-05-02 00:02:54 UTC (rev 71151)
+++ trunk/Master/tlpkg/TeXLive/TLDownload.pm 2024-05-02 17:03:11 UTC (rev 71152)
@@ -60,6 +60,7 @@
# 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
Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm 2024-05-02 00:02:54 UTC (rev 71151)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm 2024-05-02 17:03:11 UTC (rev 71152)
@@ -369,12 +369,13 @@
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
}
More information about the tex-live-commits
mailing list.