From 004963031fe8092a3dac36c64e577fa739d3feb8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 May 2017 16:06:49 +0000 Subject: 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 --- Master/install-tl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Master') 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; -- cgit v1.2.3