diff options
| -rwxr-xr-x | Master/install-tl | 1 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/uninstall-win32.pl | 7 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLWinGoo.pm | 31 |
3 files changed, 12 insertions, 27 deletions
diff --git a/Master/install-tl b/Master/install-tl index 501cb094f96..85fe208f8cf 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -66,7 +66,6 @@ if (win32) { &non_admin ®_country &expand_string - &global_tmpdir &get_system_path &get_user_path &setenv_reg diff --git a/Master/texmf-dist/scripts/texlive/uninstall-win32.pl b/Master/texmf-dist/scripts/texlive/uninstall-win32.pl index 523313a5737..6cf39b0230d 100755 --- a/Master/texmf-dist/scripts/texlive/uninstall-win32.pl +++ b/Master/texmf-dist/scripts/texlive/uninstall-win32.pl @@ -75,9 +75,10 @@ sub doit { # unsetenv_reg("TEXBINDIR"); # unsetenv_reg("TEXMFSYSVAR"); # unsetenv_reg("TEXMFCNF"); - unregister_uninstaller($localtlpdb->option("w32_multi_user")); - broadcast_env(); - update_assocs(); + TeXLive::TLWinGoo::unregister_uninstaller( + $localtlpdb->option("w32_multi_user")); + TeXLive::TLWinGoo::broadcast_env(); + TeXLive::TLWinGoo::update_assocs(); } Tk::MainLoop(); diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index 0ee3f65ec3d..3079e7724af 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -43,7 +43,6 @@ C<TeXLive::TLWinGoo> -- Additional utilities for Windows =head2 ENVIRONMENT AND REGISTRY TeXLive::TLWinGoo::expand_string($s); - TeXLive::TLWinGoo::global_tmpdir; TeXLive::TLWinGoo::get_system_path; TeXLive::TLWinGoo::get_user_path; TeXLive::TLWinGoo::setenv_reg($env_var, $env_data); @@ -93,13 +92,17 @@ BEGIN { use vars qw( @ISA @EXPORT $Registry); @ISA = qw( Exporter ); @EXPORT = qw( - &win_version &is_vista &admin &non_admin + ); + @EXPORT_OK = qw( + &win_version + &admin_again ®_country + &broadcast_env + &update_assocs &expand_string - &global_tmpdir &get_system_path &get_user_path &setenv_reg @@ -111,8 +114,6 @@ BEGIN { &unregister_extension ®ister_file_type &unregister_file_type - &broadcast_env - &update_assocs &shell_folder &desktop_path &add_desktop_shortcut @@ -122,13 +123,8 @@ BEGIN { &create_uninstaller &unregister_uninstaller &maybe_make_ro - ); - # for testing also: - @EXPORT_OK = qw( - &admin_again &get_system_env &get_user_env - &global_tmpdir &is_a_texdir &tex_dirs_on_path ); @@ -345,20 +341,8 @@ sub expand_string { return Win32::ExpandEnvironmentStrings($s); } -=pod - -=item C<global_tmpdir> - -Returns the expanded value of C<%TEMP%> from the system environment, -usually C<%SystemRoot%/Temp>. This value is normally not available -from C<%ENV>. - -=cut - my $global_tmp = $is_win ? expand_string(get_system_env()->{'TEMP'}) : "/tmp"; -sub global_tmpdir { return $global_tmp; } - sub is_a_texdir { my $d = shift; $d =~ s/\\/\//g; @@ -1378,7 +1362,8 @@ sub maybe_make_ro { # /reset is necessary for removing non-standard existing permissions my $cmd = 'cmd /c "icacls . /reset && icacls . /inheritance:r'. - ' /grant:r *S-1-5-32-544:(OI)(CI)F /grant *S-1-5-11:(OI)(CI)RX"'; + ' /grant:r *S-1-5-32-544:(OI)(CI)F /grant *S-1-3-0:(OI)(CI)F'. + ' /grant *S-1-5-11:(OI)(CI)RX"'; log "Making read-only\n".`$cmd`."\n"; # go back to original directory |