diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 6 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/c2lx | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index ac7b6c36505..70a1deaa2f4 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -290,6 +290,10 @@ sub from_file { } if ($params{'media'}) { $media = $params{'media'}; + } elsif (! -d $rootpath) { + # no point in going on if we don't even have a directory. + tlwarn("TLPDB: not a directory, not loading: $rootpath\n"); + return 0; } elsif (-d "$rootpath/texmf-dist/web2c") { $media = 'local_uncompressed'; } elsif (-d "$rootpath/texmf/web2c") { # older @@ -300,7 +304,7 @@ sub from_file { $media = 'local_compressed'; } else { # we cannot find the right type, return zero, hope people notice - tlwarn("Cannot determine type of tlpdb from $rootpath!\n"); + tlwarn("TLPDB: Cannot determine type of tlpdb from $rootpath!\n"); return 0; } } diff --git a/Master/tlpkg/bin/c2lx b/Master/tlpkg/bin/c2lx index 5e7bed389e1..183854cde6b 100755 --- a/Master/tlpkg/bin/c2lx +++ b/Master/tlpkg/bin/c2lx @@ -17,17 +17,15 @@ cp /dev/null $dirsfile.tmp cp /dev/null /tmp/first if test "x$1" = xe; then - shift - label=l2e + shift; label=l2e pkgs="amsmath cyrillic graphics tools latex" # latex-tds still has knuth psnfss; babel is separate elif test "x$1" = xdev; then - shift - label=ldev + shift; label=ldev pkgs="latex-amsmath-dev latex-graphics-dev latex-tools-dev latex-base-dev" # latex-tds still has knuth psnfss; babel is separate elif test "x$1" = x3; then - label=l3 + shift; label=l3 pkgs="l3kernel l3packages l3experimental l3build l3backend" else echo "$0: unknown latex type: $1 (one of: e dev 3)" >&2 |