diff options
| author | Siep Kroonenberg <siepo@cybercomm.nl> | 2011-05-30 19:42:46 +0000 |
|---|---|---|
| committer | Siep Kroonenberg <siepo@cybercomm.nl> | 2011-05-30 19:42:46 +0000 |
| commit | 9629e970cd48e4e43c78ae4105bd3380b4cb82f5 (patch) | |
| tree | 7ceb8edacf91d4fa569364802da598d6c2e57b4a /Master/tlpkg/installer/install-menu-perltk.pl | |
| parent | 03614d57b851e87bd64f908b6c1dfad07b945811 (diff) | |
Fixes for handling TEXDIR
git-svn-id: svn://tug.org/texlive/trunk@22688 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-perltk.pl')
| -rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 7f17d1d6d1b..8b57a620dd5 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -323,7 +323,7 @@ sub run_menu_perltk { if ($::opt_all_options || win32()) { $row++; - $fr->Label(-text => __('Add shortcuts to menu and desktop'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); + $fr->Label(-text => __('Add menu shortcuts'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); $fr->Label(-anchor => 'w', -textvariable => \$deskintyesno)->grid(-row => $row, -column => 2, -padx => "2m"); $deskintbutton = $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno); }); $deskintbutton->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); @@ -886,7 +886,7 @@ sub menu_set_pathes_text { if (TeXLive::TLUtils::texdir_check($vars{'TEXDIR'})) { menu_set_text($texdirtext, native_slashify($vars{'TEXDIR'}), -foreground => "black"); } else { - menu_set_text($texdirtext, __("(default not writable - please change!)"), -foreground => "red"); + menu_set_text($texdirtext, __("(default not allowed or not writable - please change!)"), -foreground => "red"); } menu_set_text($texmflocaltext, native_slashify($vars{'TEXMFLOCAL'})); if ((-w $vars{'TEXMFSYSVAR'}) || (-w dirname($vars{'TEXMFSYSVAR'}))) { @@ -982,7 +982,15 @@ sub callback_edit_directories { $vars{'TEXMFSYSVAR'}="$texdirnoslash/texmf-var"; $vars{'TEXMFSYSCONFIG'}="$texdirnoslash/texmf-config"; } - $vars{'TEXDIRW'}=$vars{'TEXDIR'} + if ($vars{'TEXDIR'} =~ /:$/) { + # drive letter + $vars{'TEXDIR'} = $vars{'TEXDIR'}."/"; + # note: main::do_installation will remove this final slash + } elsif ($vars{'TEXDIR'} =~ /\/$/ and $vars{'TEXDIR'} !~ /:\/$/) { + # remove final slash + $vars{'TEXDIR'} =~ s!/$!!; + } + #$vars{'TEXDIRW'}=$vars{'TEXDIR'} } menu_update_texts(); } |