summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-02 23:52:46 +0000
committerKarl Berry <karl@freefriends.org>2008-07-02 23:52:46 +0000
commit376383f4310b2ff3811d2e933f956ee7ca54df12 (patch)
treef1a989817f0c48ae78d80466fcabad8ef955264f /Master/install-tl
parentb56e66944a70a65ebf75d3757350058caab1d0e3 (diff)
use TLConfig values for default locations instead of hardwiring
git-svn-id: svn://tug.org/texlive/trunk@9178 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl8
1 files changed, 2 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 2f26fae262c..8e038d94eca 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -325,12 +325,8 @@ if ($opt_from_dvd and ($::_media_ ne "DVD")) {
}
$vars{'from_dvd'} = $opt_from_dvd;
-setup_programs("$::installerdir/tlpkg/installer", "$::_platform_");
-if ("$opt_url" ne "") {
- $TeXLiveURL = "$opt_url";
-} else {
- $TeXLiveURL = TeXLive::TLUtils::give_ctan_mirror();
-}
+setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_");
+$TeXLiveURL = $opt_url || TeXLive::TLUtils::give_ctan_mirror();
info("Using URL $TeXLiveURL\n");
load_tlpdb();