diff options
Diffstat (limited to 'Master/tlpkg/installer')
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 14 | ||||
-rwxr-xr-x | Master/tlpkg/installer/install-menu-text.pl | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index f2a7c87504a..9cfff29955b 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -148,6 +148,7 @@ my %labels = ( binsys => 'Binary System(s)', texdir => 'TEXDIR (main TeX directory)', localdir => 'TEXMFLOCAL (local styles etc)', sysvardir => 'TEXMFSYSVAR (local config)', + texmfhome => 'TEXMFHOME (user styles)', optletter => 'Use letter instead of A4 by default', optfmt => 'Create all format files', optdoc => 'Install font/macro doc tree', @@ -281,6 +282,12 @@ sub run_menu { $texmfsysvartext = $fsys->Label(-width => $b, -anchor => 'w')->pack(-side => 'left'); $fsys->Button(-width => $c, -text => $text{'change'}, -command => sub { menu_edit_vars_value("TEXMFSYSVAR"); })->pack(-side => 'left'); + # texmfhome line + my $fhome = $fr->Frame; $fhome->pack; + $fhome->Label(-text => $labels{'texmfhome'}, -width => $a, -anchor => 'w')->pack(-side => 'left'); + $texmfhometext = $fhome->Label(-width => $b, -anchor => 'w')->pack(-side => 'left'); + $fhome->Button(-width => $c, -text => $text{'change'}, -command => sub { menu_edit_vars_value("TEXMFHOME"); })->pack(-side => 'left'); + # Options $fr->Label(-text => "------- $text{'options'} -------")->pack; @@ -628,6 +635,7 @@ sub menu_set_pathes_text { menu_set_text($texdirtext, "$vars{'TEXDIR'}"); menu_set_text($texmflocaltext, "$vars{'TEXMFLOCAL'}"); menu_set_text($texmfsysvartext, "$vars{'TEXMFSYSVAR'}"); + menu_set_text($texmfhometext, "$vars{'TEXMFHOME'}"); } @@ -663,7 +671,13 @@ sub callback_select_systems() { sub callback_edit_directories { my ($key,$val) = @_; + my $home = getenv('HOME'); + $home = getenv('USERPROFILE') if (win32); + $home ||= '~'; $vars{$key} = $val; + $vars{'TEXDIR'} =~ s/^~/$home/; + $vars{'TEXMFLOCAL'} =~ s/^~/$home/; + $vars{'TEXMFSYSVAR'} =~ s/^~/$home/; if ($vars{'TEXDIR'}=~/^(.*)\/$texlive_release$/) { $vars{'TEXMFLOCAL'}="$1/texmf-local"; $vars{'TEXMFSYSVAR'}="$1/$texlive_release/texmf-var"; diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 8dcc0ebed54..fc1c536edd2 100755 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -471,11 +471,15 @@ EOF other_options qw (R Q); my $answer=prompt 'Enter command'; + my $home = getenv('HOME'); + $home = getenv('USERPROFILE') if (win32); + $home ||= '~'; if ("\u$answer" eq '1') { print "New value TEXDIR [$vars{'TEXDIR'}]: "; chomp($answer=<STDIN>); $vars{'TEXDIR'}="$answer" if (length $answer); $vars{'TEXDIR'}=~s@\\@/@g if (win32); + $vars{'TEXDIR'} =~ s/^~/$home/; if ($vars{'TEXDIR'}=~/^(.*)\/$texlive_release$/) { $vars{'TEXMFLOCAL'}="$1/texmf-local"; $vars{'TEXMFSYSVAR'}="$1/$texlive_release/texmf-var"; @@ -491,6 +495,7 @@ EOF chomp($answer=<STDIN>); $vars{'TEXMFLOCAL'}="$answer" if (length $answer); $vars{'TEXMFLOCAL'}=~s@\\@/@g if (win32); + $vars{'TEXMFLOCAL'} =~ s/^~/$home/; return $command{'self'}; } if ("\u$answer" eq '3') { @@ -498,6 +503,7 @@ EOF chomp($answer=<STDIN>); $vars{'TEXMFSYSVAR'}="$answer" if (length $answer); $vars{'TEXMFSYSVAR'}=~s@\\@/@g if (win32); + $vars{'TEXMFSYSVAR'} =~ s/^~/$home/; return $command{'self'}; } if ("\u$answer" eq '4') { |