From 7f9f41da9cef87b2c7eb9cd7fc2c05fbe8da77a7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 21 Mar 2019 22:55:16 +0000 Subject: 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 --- Master/install-tl | 19 +++++++------------ Master/tlpkg/bin/tl-try-install | 4 ++-- 2 files changed, 9 insertions(+), 14 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.", diff --git a/Master/tlpkg/bin/tl-try-install b/Master/tlpkg/bin/tl-try-install index d83874b5170..e1e1f6814ec 100755 --- a/Master/tlpkg/bin/tl-try-install +++ b/Master/tlpkg/bin/tl-try-install @@ -13,15 +13,15 @@ rm -rf $instdir* && echo "removed $instdir*." 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 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 -- cgit v1.2.3