From 21c401925b2e3b1b3073b0eaf846281b6fa5d62c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 6 Jul 2009 13:12:07 +0000 Subject: - put the add/remove path to reg for w32 into separate function in TLUtils, - use these funcions in install-tl and uninstall-win32.pl git-svn-id: svn://tug.org/texlive/trunk@14147 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'Master/install-tl') diff --git a/Master/install-tl b/Master/install-tl index b459f63a8c0..2ede35a0e3b 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -791,30 +791,10 @@ sub do_tlpdb_postactions { sub do_path_adjustments { info ("running path adjustment actions\n"); if (win32()) { - update_assocs(); - - my $path = TeXLive::TLWinGoo::get_system_env() -> {'/Path'}; - $path =~ s/[\s\x00]+$//; - log("Old system path: $path\n"); - $path = TeXLive::TLWinGoo::get_user_env() -> {'/Path'}; - if ($path) { - $path =~ s/[\s\x00]+$//; - log("Old user path: $path\n"); - } else { - log("Old user path: none\n"); - } - my $mode = $vars{'option_w32_multi_user'} ? 'system' : 'user'; - adjust_reg_path_for_texlive('add', $vars{'TEXDIR'}.'/bin/win32', $mode); - $path = TeXLive::TLWinGoo::get_system_env() -> {'/Path'}; - $path =~ s/[\s\x00]+$//; - log("New system path: $path\n"); - $path = TeXLive::TLWinGoo::get_user_env() -> {'/Path'}; - if ($path) { - $path =~ s/[\s\x00]+$//; - log("New user path: $path\n"); - } else { - log("New user path: none\n"); - } + TeXLive::TLUtils::w32_add_to_path($vars{'TEXDIR'}.'/bin/win32', + $vars{'option_w32_multi_user'}); + # + # from_dvd stuff # setenv_reg('TEXMFSYSVAR', $vars{'TEXMFSYSVAR'}) if $vars{'from_dvd'}; setenv_reg('TEXMFCNF', $vars{'TEXMFSYSVAR'}.'/web2c') if $vars{'from_dvd'}; broadcast_env(); -- cgit v1.2.3