summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-18 22:03:53 +0000
committerKarl Berry <karl@freefriends.org>2019-10-18 22:03:53 +0000
commitca12085c6abf69abfccf15ce647d7e752cad7dd1 (patch)
tree65611e8f5b890e4867227430045b7f2a2a100f86
parent03344ee5f398f95f9718a92eb89facc20e0b74e6 (diff)
require that the profile be a regular file, not just readable.
git-svn-id: svn://tug.org/texlive/trunk@52435 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl26
1 files changed, 15 insertions, 11 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 8cbaf6675e9..3ca1a0ae65a 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -452,12 +452,12 @@ if (defined($::opt_lang)) {
}
if ($opt_profile) { # for now, not allowed if in_place
- if (-r $opt_profile) {
+ if (-r $opt_profile && -f $opt_profile) {
info("Automated TeX Live installation using profile: $opt_profile\n");
} else {
$opt_profile = "";
info(
- "Profile $opt_profile not readable, continuing in interactive mode.\n");
+"Profile $opt_profile not readable or not a file, continuing in interactive mode.\n");
}
}
@@ -2150,19 +2150,23 @@ sub do_install_packages {
$localtlpdb->option ("file_assocs", "0");
$localtlpdb->option ("post_code", "0");
if (!install_packages($tlpdb,$media,$localtlpdb,\@what,
- $vars{'tlpdbopt_install_srcfiles'},$vars{'tlpdbopt_install_docfiles'})) {
+ $vars{'tlpdbopt_install_srcfiles'},
+ $vars{'tlpdbopt_install_docfiles'})) {
my $profile_name = "installation.profile";
create_profile($profile_name);
tlwarn("Installation failed.\n");
tlwarn("Rerunning the installer will try to restart the installation.\n");
- tlwarn("Or you can restart by running the installer with:\n");
- my $repostr = ($opt_location ? " --repository $location" : "");
- if (win32()) {
- tlwarn(" install-tl-windows.bat$repostr --profile $profile_name [EXTRA-ARGS]\n"
- ."or\n"
- ." install-tl-advanced.bat$repostr --profile $profile_name [EXTRA-ARGS]\n");
- } else {
- tlwarn(" install-tl$repostr --profile $profile_name [EXTRA-ARGS]\n");
+ if (-r $profile_name) {
+ # only suggest rerunning with the profile if it exists.
+ tlwarn("Or you can restart by running the installer with:\n");
+ my $repostr = ($opt_location ? " --repository $location" : "");
+ if (win32()) {
+ tlwarn(" install-tl-windows.bat$repostr --profile $profile_name [EXTRA-ARGS]\n"
+ ."or\n"
+ ." install-tl-advanced.bat$repostr --profile $profile_name [EXTRA-ARGS]\n");
+ } else {
+ tlwarn(" install-tl$repostr --profile $profile_name [EXTRA-ARGS]\n");
+ }
}
flushlog();
exit(1);