diff options
| -rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 9 | ||||
| -rwxr-xr-x | Master/tlpkg/installer/install-menu-text.pl | 7 | ||||
| -rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 9 |
3 files changed, 4 insertions, 21 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 27f3cd03e5a..37e70eb5e74 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -1193,15 +1193,6 @@ sub callback_edit_directories { $vars{'TEXMFSYSVAR'}="$texdirnoslash/texmf-var"; $vars{'TEXMFSYSCONFIG'}="$texdirnoslash/texmf-config"; } - 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(); } diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index ac7c6e748d2..18d2fa66a0b 100755 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -578,7 +578,7 @@ sub directories_menu "; } my $texmfdir = $vars{'TEXDIR'} . - ($vars{'TEXDIR'} =~ /\/$/ ? 'texmf' : '/texmf'); + ($vars{'TEXDIR'} =~ /\/$/ ? 'texmf-dist' : '/texmf-dist'); if (!$vars{'in_place'}) { print <<"EOF"; <1> TEXDIR: $vars{'TEXDIR'} @@ -700,7 +700,8 @@ sub input_dirname # relative paths are unlikely to work in texmf.cnf, et al., # and don't have any apparent practical use. Convert to absolute. if (! File::Spec->file_name_is_absolute($answer)) { - $answer = Cwd::abs_path($answer); + $answer = TeXLive::TLUtils::tl_abs_path($answer); + $answer = "" unless defined $answer; } } return $answer; @@ -1124,7 +1125,7 @@ EOF print " $vars{'TEXDIR'}\n"; } else { print " !! default location: $vars{'TEXDIR'}\n"; - print " !! is not writable, please select a different one!\n"; + print " !! is not writable or not allowed, please select a different one!\n"; } print <<"EOF"; TEXMFLOCAL (directory for site-wide local files): diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index 11808d9334e..e44e29ed072 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -553,15 +553,6 @@ sub callback_change_texdir { $vars{'TEXMFSYSVAR'}="$texdirnoslash/texmf-var"; $vars{'TEXMFSYSCONFIG'}="$texdirnoslash/texmf-config"; } - if ($vars{'TEXDIR'} =~ /:$/) { - # drive letter: add final slash - $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'}; $dest = $vars{'TEXDIR'}; $dest_display = native_slashify($dest); # useful as -textvar value in Labels check_show_warning(); |