diff options
-rwxr-xr-x | Master/install-tl.pl | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl index f457da0febb..8f7049b61ea 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -30,6 +30,8 @@ BEGIN { @INC="$::installerdir/tlpkg/lib/Perl5_lib-TL_inst"; } unshift (@INC, "$::installerdir/tlpkg"); + # DEBUG + unshift (@INC, "C:/tlperl/lib"); } use TeXLive::TLUtils qw(initialize_installer media platform platform_desc @@ -56,8 +58,8 @@ our $trynet=0; # for now it is my testing archive on tug.org #$::texlive_url = 'http://tug.org/svn/texlive/trunk/Master'; # for my own testing in the virtual machine -#$::texlive_url = 'http://10.0.2.2/norbert/tltesting'; -$::texlive_url = 'http://tug.org/~preining/tltesting'; +$::texlive_url = 'http://10.0.2.2/norbert/tltesting'; +#$::texlive_url = 'http://tug.org/~preining/tltesting'; # the default scheme to be installed my $default_scheme='scheme-full'; # some arrays where the lists of collections to be installed are saved @@ -741,15 +743,9 @@ sub do_win_registry_magic { # we are called under if (win32()) !! my $winpath = "$vars{'TEXDIR'}/bin/win32"; $winpath =~ s!/!\\!g; + my $classespath; if ($vars{'win-admin'}) { - # generate a .texlua association and link it to texlua.exe, which should - # be in the path! - my $classes = $Registry->Open( "Classes/", {Access=>'KEY_ALL_ACCESS',Delimiter=>"/"}); - $classes->CreateKey(".texlua")->SetValue("","script.texlua"); - my $scriptkey = $classes->CreateKey("script.texlua"); - $scriptkey->SetValue("", "TeXLua Script"); - $scriptkey->CreateKey("Shell/Open/Command/")->SetValue("","$winpath\\texlua.exe %1 %*"); - + # these things can only be done by admins # PATHEXT editing # should this be currentcontrolset or ControlSet001 ???? my $winenv = $Registry->Open( "LMachine/SYSTEM/CurrentControlSet/Control/Session Manager/Environment/", {Access=>'KEY_ALL_ACCESS',Delimiter=>"/"}); @@ -766,9 +762,23 @@ sub do_win_registry_magic { my $wpath = $winenv->GetValue("Path"); $wpath .= ";$winpath"; $winenv->SetValue("Path","$wpath", "REG_EXPAND_SZ"); + + # for the .texlua binding we can do it for admin and normal users + # but with different registry pathes + $classespath = "LMachine/Software/Classes/"; } else { - warn "Don't know what to do if a non admin user installs texlive on win32\n!"; - } + warn "non-admin users: no Path and PATHEXT setting possible.\n"; + # for non-admin users the classes path is different + # (Siep, email 2008-01-09) + $classespath = "Users/Software/Classes/"; + } + # generate a .texlua association and link it to texlua.exe, which should + # be in the path! + my $classes = $Registry->Open( $classespath, {Access=>'KEY_ALL_ACCESS',Delimiter=>"/"}); + $classes->CreateKey(".texlua")->SetValue("","script.texlua"); + my $scriptkey = $classes->CreateKey("script.texlua"); + $scriptkey->SetValue("", "TeXLua Script"); + $scriptkey->CreateKey("Shell/Open/Command/")->SetValue("","$winpath\\texlua.exe %1 %*"); } |