diff options
-rwxr-xr-x | Master/install-tl.pl | 4 | ||||
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk-de.pl (renamed from Master/tlpkg/TeXLive/install-menu-perltk-de.pl) | 0 | ||||
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl (renamed from Master/tlpkg/TeXLive/install-menu-perltk.pl) | 6 | ||||
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl.old (renamed from Master/tlpkg/TeXLive/install-menu-perltk.pl.old) | 0 | ||||
-rwxr-xr-x | Master/tlpkg/installer/install-menu-text.pl (renamed from Master/tlpkg/TeXLive/install-menu-text.pl) | 0 | ||||
-rw-r--r-- | Master/tlpkg/installer/texlive2008.png (renamed from Master/texlive2008.png) | bin | 46440 -> 46440 bytes | |||
-rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl index 369b94f2d06..32a15b68d15 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -239,9 +239,9 @@ if ($opt_profile eq "") { } } if ($opt_gui) { - require("TeXLive/install-menu-perltk.pl"); + require("installer/install-menu-perltk.pl"); } else { - require("TeXLive/install-menu-text.pl"); + require("installer/install-menu-text.pl"); } my $ret = run_menu(); if ($ret == $MENU_QUIT) { diff --git a/Master/tlpkg/TeXLive/install-menu-perltk-de.pl b/Master/tlpkg/installer/install-menu-perltk-de.pl index e89c764e683..e89c764e683 100644 --- a/Master/tlpkg/TeXLive/install-menu-perltk-de.pl +++ b/Master/tlpkg/installer/install-menu-perltk-de.pl diff --git a/Master/tlpkg/TeXLive/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 742ef8fd457..739aceeaf2a 100644 --- a/Master/tlpkg/TeXLive/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -138,10 +138,10 @@ my %labels = ( binsys => 'Binary System(s)', ); if ($::lang ne "en") { - eval { require("TeXLive/install-menu-perltk-$::lang.pl"); }; + eval { require("installer/install-menu-perltk-$::lang.pl"); }; if ($@) { # couldn't find the file, continue with english - warn "Couldn't find language file TeXLive/install-menu-perltk-$::lang.pl: $!\nContinuing in English!\n"; + warn "Couldn't find language file installer/install-menu-perltk-$::lang.pl: $!\nContinuing in English!\n"; } else { # merge the translated strings into the text string foreach my $k (keys %translatedtext) { @@ -183,7 +183,7 @@ sub run_menu { # image frame on the left my $fl = $mw->Frame; - my $img = $fl->Photo(-format => 'png', -file => "texlive2008.png"); + my $img = $fl->Photo(-format => 'png', -file => "tlpkg/installer/texlive2008.png"); $fl->Label(-image => $img)->pack; $fl->Label(-text => "v$::installerrevision/$::menurevision" . ($::lang eq "en"? "" : "/$::lang$langrevision"))->pack; diff --git a/Master/tlpkg/TeXLive/install-menu-perltk.pl.old b/Master/tlpkg/installer/install-menu-perltk.pl.old index d9b96e2575b..d9b96e2575b 100644 --- a/Master/tlpkg/TeXLive/install-menu-perltk.pl.old +++ b/Master/tlpkg/installer/install-menu-perltk.pl.old diff --git a/Master/tlpkg/TeXLive/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 3c3719096d1..3c3719096d1 100755 --- a/Master/tlpkg/TeXLive/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl diff --git a/Master/texlive2008.png b/Master/tlpkg/installer/texlive2008.png Binary files differindex 948889d933b..948889d933b 100644 --- a/Master/texlive2008.png +++ b/Master/tlpkg/installer/texlive2008.png diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc index 1ade4bf0bdc..3ba5a7b0119 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc @@ -2,9 +2,9 @@ name 00texlive.installer category TLCore runpattern f install-tl.pl runpattern f install-tl.html -runpattern f texlive2008.png runpattern f config.guess runpattern d tlpkg/TeXLive +runpattern d tlpkg/installer binpattern f tlpkg/bin/lzmadec.${ARCH} binpattern f/win32 tlpkg/bin/perl.exe binpattern f/win32 tlpkg/bin/wget.exe |