diff options
author | Norbert Preining <norbert@preining.info> | 2022-06-06 09:28:38 +0900 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-06-06 09:28:38 +0900 |
commit | f71c43c8203dcadceb945d94295ebd0aa6dd6d81 (patch) | |
tree | 6d776880cf1c757259687601d48402ad9484e591 | |
parent | 1f26e3f229e8f11e77502b1f68feeca398b98b1f (diff) |
install-tl: prefer --paper over env var, warn if both givendev/install-tl-interactive
-rwxr-xr-x | Master/install-tl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Master/install-tl b/Master/install-tl index 8c8d955355c..0b026d4af2e 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -1267,11 +1267,15 @@ operations might be disturbed.\n\n"; tlwarn("$0: TEXLIVE_INSTALL_PAPER value must be letter or a4, not: " . "$env_paper (ignoring)\n"); } - } elsif ($opt_paper) { + } + if ($opt_paper) { + if (defined $env_paper) { + tlwarn("$0: paper selection via env var TEXLIVE_INSTALL_PAPER and cmdline arg --paper, preferring the later!\n"); + } if ($opt_paper eq "letter") { $vars{'instopt_letter'} = 1; } elsif ($opt_paper eq "a4") { - ; # do nothing + $vars{'instopt_letter'} = 0; } else { tlwarn("$0: cmd line option --paper value must be letter or a4, not: " . "$opt_paper (ignoring)\n"); |