summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-21 22:55:16 +0000
committerKarl Berry <karl@freefriends.org>2019-03-21 22:55:16 +0000
commit7f9f41da9cef87b2c7eb9cd7fc2c05fbe8da77a7 (patch)
tree1bd09d0009f1f1cccba1065300f7924483162da9 /Master/install-tl
parent4b76b542437c3cb32cf5e4488d0c298eba7341eb (diff)
omit path adjustment text if system symlinks were installed, suggestion from Denis Bitouze
git-svn-id: svn://tug.org/texlive/trunk@50519 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl19
1 files changed, 7 insertions, 12 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 8aac28e7f06..f93f6938d6b 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -7,16 +7,6 @@
#
# Be careful when changing wording: *every* normal informational message
# output here must be recognized by the long grep in tl-update-tlnet.
-#
-# TODO:
-# - with -gui pop up a transient window showing:
-# testing for compressed archive packages ...
-# testing for uncompressed live system ...
-# testing for network access ...
-# loading tlpdb, this can take some time ...
-# (that, and maybe some others can be done with the waitVariableX
-# thingy as described in the Perl/Tk book in the chapter that can be
-# found on the net) (Werner 28.10.08)
my $svnrev = '$Revision$';
$svnrev =~ m/: ([0-9]+) /;
@@ -1245,7 +1235,7 @@ operations might be disturbed.\n\n";
# for portable, this option should be unset
# it should not be necessary to test separately for portable
$errcount += do_path_adjustments() if
- $vars{'instopt_adjustpath'} and $vars{tlpdbopt_desktop_integration} != 2;
+ $vars{'instopt_adjustpath'} and $vars{'tlpdbopt_desktop_integration'} != 2;
# now do the system integration:
# on unix this means setting up symlinks
@@ -2553,7 +2543,12 @@ sub create_welcome {
push @::welcome_arr, __(
"See %s/index.html for links to documentation.\nThe TeX Live web site (https://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at https://tug.org/usergroups.html.",
$::vars{'TEXDIR'});
- if (!win32()) {
+ if (win32()
+ || ($vars{'instopt_adjustpath'}
+ && $vars{'tlpdbopt_desktop_integration'} != 2)) {
+ ; # don't tell them to make path adjustments on Windows,
+ # or if they chose to "create symlinks".
+ } else {
push @::welcome_arr, "\n";
push @::welcome_arr, __(
"Add %s/texmf-dist/doc/man to MANPATH.\nAdd %s/texmf-dist/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.",