summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-02 16:06:49 +0000
committerKarl Berry <karl@freefriends.org>2017-05-02 16:06:49 +0000
commit004963031fe8092a3dac36c64e577fa739d3feb8 (patch)
tree0b549777b34e587a3f6dbeff389646515d10e877 /Master
parent0b1b85702239b85c013c3a89218bd5cdcce06b04 (diff)
revert move set_texlive_default_dirs, $texlive_release is not set yet
git-svn-id: svn://tug.org/texlive/trunk@44150 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl10
1 files changed, 4 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl
index cf298ed8b82..580a8047f1a 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -391,9 +391,6 @@ END_NO_CHECKSUMS
# 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 @@ sub final_remote_init {
$vars{'doc_splitting_supported'} = $tlpdb->config_doc_container;
}
set_platforms_supported();
+ set_texlive_default_dirs();
set_install_platform();
initialize_collections();
@@ -1663,11 +1661,11 @@ END_EXPLICIT_MIRROR
# 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;