diff options
author | Norbert Preining <preining@logic.at> | 2009-07-06 14:38:57 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2009-07-06 14:38:57 +0000 |
commit | d8ae0710347d4e4dd75fe7710af9fc36fa8a6695 (patch) | |
tree | 42c73e6911bdbfcd9aa92f53c4f2e5c1881c7776 | |
parent | f90e3126f681edcbb5aa9cf4924c9b0474c2860e (diff) |
- tlmgr: after adding/removing the path on Win, call broadcast_env
- TLWinGoo: comparison of path unifies the slashes
git-svn-id: svn://tug.org/texlive/trunk@14153 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 2 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 1 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLWinGoo.pm | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 799aeb3855b..600615ae872 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -889,6 +889,7 @@ sub action_path { TeXLive::TLUtils::w32_add_to_path( $localtlmedia->location . "/bin/win32", $localtlmedia->tlpdb->option("w32_multi_user")); + TeXLive::TLWinGoo::broadcast_env(); } else { TeXLive::TLUtils::add_symlinks($localtlmedia->tlpdb->root, $localtlmedia->platform(), @@ -901,6 +902,7 @@ sub action_path { TeXLive::TLUtils::w32_remove_from_path( $localtlmedia->location . "/bin/win32", $localtlmedia->tlpdb->option("w32_multi_user")); + TeXLive::TLWinGoo::broadcast_env(); } else { # remove symlinks TeXLive::TLUtils::remove_symlinks($localtlmedia->tlpdb->root, diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index a8296e3c3f7..3aef571a81a 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -1867,6 +1867,7 @@ sub w32_remove_from_path { if (TeXLive::TLWinGoo::admin() && $multiuser) { $mode = 'system'; } + debug("w32_remove_from_path: trying to remove $bindir in $mode\n"); TeXLive::TLWinGoo::adjust_reg_path_for_texlive('remove', $bindir, $mode); } diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index 1bb81135496..e83b24442f8 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -489,6 +489,8 @@ sub adjust_reg_path_for_texlive { my $tex_dir_conflict = 0; foreach $d (split (';', $path)) { $d_short = uc(short_name(expand_string($d))); + $d_short =~ s!/!\\!g; + ddebug("adjust_reg: compar $d_short with $tlbindir_short\n"); if ($d_short ne $tlbindir_short) { push(@newpath, $d); $tex_dir_conflict += is_a_texdir($d); |