summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-02 17:03:11 +0000
committerKarl Berry <karl@freefriends.org>2024-05-02 17:03:11 +0000
commit5fd3248d090b6f847f303255e30523195155fe0f (patch)
tree423637d0ea094f8f4c1e3c8bbc35e2c6230a0ad5 /Master/install-tl
parent04907b0f8cdb2662b6565b7ae00dfbd3fb5cbf6c (diff)
check for cygwin curl or wget
git-svn-id: svn://tug.org/texlive/trunk@71152 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl28
1 files changed, 22 insertions, 6 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