texlive[44150] Master/install-tl: revert move
commits+karl at tug.org
commits+karl at tug.org
Tue May 2 18:06:50 CEST 2017
Revision: 44150
http://tug.org/svn/texlive?view=revision&revision=44150
Author: karl
Date: 2017-05-02 18:06:49 +0200 (Tue, 02 May 2017)
Log Message:
-----------
revert move set_texlive_default_dirs, $texlive_release is not set yet
Modified Paths:
--------------
trunk/Master/install-tl
Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl 2017-05-02 09:57:51 UTC (rev 44149)
+++ trunk/Master/install-tl 2017-05-02 16:06:49 UTC (rev 44150)
@@ -391,9 +391,6 @@
# continuing with normal install
-# set default directories
-set_texlive_default_dirs();
-
# check as soon as possible for GUI functionality to give people a chance
# to interrupt.
if (($opt_gui ne "text") && !$opt_no_gui && ($opt_profile eq "")) {
@@ -765,6 +762,7 @@
$vars{'doc_splitting_supported'} = $tlpdb->config_doc_container;
}
set_platforms_supported();
+ set_texlive_default_dirs();
set_install_platform();
initialize_collections();
@@ -1663,11 +1661,11 @@
# select scheme: either $vars{'selected_scheme'} or $default_scheme
# check that the default scheme is actually present, otherwise switch to
# scheme-minimal
- my $selscheme =
- (defined($vars{'selected_scheme'}) ? $vars{'selected_scheme'} : $default_scheme);
+ my $selscheme = defined($vars{'selected_scheme'}) ? $vars{'selected_scheme'}
+ : $default_scheme;
if (!defined($tlpdb->get_package($selscheme))) {
if (!defined($tlpdb->get_package("scheme-minimal"))) {
- die("Aborting, cannot find either $selscheme or scheme_minimal");
+ die("Aborting, cannot find either $selscheme or scheme-minimal");
}
$default_scheme = "scheme-minimal";
$vars{'selected_scheme'} = $default_scheme;
More information about the tex-live-commits
mailing list