texlive[50519] Master: omit path adjustment text if system symlinks

[commits+karl at tug.org]

Revision: 50519
          http://tug.org/svn/texlive?view=revision&revision=50519
Author:   karl
Date:     2019-03-21 23:55:16 +0100 (Thu, 21 Mar 2019)
Log Message:
-----------
omit path adjustment text if system symlinks were installed, suggestion from Denis Bitouze

Modified Paths:
--------------
    trunk/Master/install-tl
    trunk/Master/tlpkg/bin/tl-try-install

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2019-03-21 22:53:45 UTC (rev 50518)
+++ trunk/Master/install-tl	2019-03-21 22:55:16 UTC (rev 50519)
@@ -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 @@
   # 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 @@
   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.",

Modified: trunk/Master/tlpkg/bin/tl-try-install
===================================================================
--- trunk/Master/tlpkg/bin/tl-try-install	2019-03-21 22:53:45 UTC (rev 50518)
+++ trunk/Master/tlpkg/bin/tl-try-install	2019-03-21 22:55:16 UTC (rev 50519)
@@ -13,8 +13,8 @@
 
 real0=`realpath $0`
 mydir=`cd \`dirname "$real0"\` && pwd`  # Master/tlpkg/bin
-echo "mydir=$mydir"
 Master=`cd $mydir/../.. && pwd`
+profiledir=$Master/tlpkg/dev/profiles
 
 # don't let cwd or existing PATH interfere
 cd "$HOME" || exit 1
@@ -21,7 +21,7 @@
 PATH=/usr/local/bin:/usr/bin:/bin # /usr/local/bin for good perl on tug
 
 set -x
-pro=--profile=${1-$Master/tlpkg/dev/profiles/TLinfra+none.pro} #infra min ... full
+pro=--profile=${1-$profiledir/TLinfra.pro} #infra min ... full
 exec time $Master/install-tl $pro
 cust=--custom-bin=$wb
 exec time $Master/install-tl $cust $pro