diff options
author | Siep Kroonenberg <siepo@cybercomm.nl> | 2023-02-20 10:13:03 +0000 |
---|---|---|
committer | Siep Kroonenberg <siepo@cybercomm.nl> | 2023-02-20 10:13:03 +0000 |
commit | 9ee58eb9194a4e75c74da705559b56c8204cffef (patch) | |
tree | 1705182be95ef063ebf267a92d248416271db730 /Master/tlpkg/installer | |
parent | 81112f8b0ad3c7f836f0c69aafee1f6a813772b8 (diff) |
Transition 32-bit => 64-bit for Windows; tlpkg/installer files
git-svn-id: svn://tug.org/texlive/trunk@65951 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer')
-rw-r--r-- | Master/tlpkg/installer/install-menu-extl.pl | 2 | ||||
-rw-r--r-- | Master/tlpkg/installer/install-menu-text.pl | 30 | ||||
-rwxr-xr-x | Master/tlpkg/installer/tl-cmd.bat | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/Master/tlpkg/installer/install-menu-extl.pl b/Master/tlpkg/installer/install-menu-extl.pl index 4dd16ade9c7..5417d59ae6d 100644 --- a/Master/tlpkg/installer/install-menu-extl.pl +++ b/Master/tlpkg/installer/install-menu-extl.pl @@ -123,7 +123,7 @@ sub run_menu_extl { print "year: $texlive_release\n"; print "svn: $::installerrevision\n"; # for windows, add a key indicating elevated permissions - if (win32()) { + if (wndws()) { print "admin: ". TeXLive::TLWinGoo::admin() . "\n"; } print_descs(); diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index f941ba7659a..d359cf42f8d 100644 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -40,7 +40,7 @@ $::fileassocdesc[2] = __("All"); $::deskintdesc[0] = __("None"); $::deskintdesc[1] = __("Menu shortcuts"); -if (win32()) { $::deskintdesc[2] = __("Launcher"); } +if (wndws()) { $::deskintdesc[2] = __("Launcher"); } sub clear_screen { return 0 if ($::opt_no_cls); @@ -323,7 +323,7 @@ sub binary_menu { print "Unknown command: $answer\n\n"; } } - if ($vars{"binary_win32"}) { + if ($vars{"binary_windows"}) { $vars{"collection-wintools"} = 1; } else { $vars{"collection-wintools"} = 0; @@ -371,7 +371,7 @@ sub scheme_menu { select_scheme($vars{'selected_scheme'}); - if ($vars{"binary_win32"}) { + if ($vars{"binary_windows"}) { $vars{"collection-wintools"} = 1; } else { $vars{"collection-wintools"} = 0; @@ -532,7 +532,7 @@ EOF EOF - if (win32) { + if (wndws()) { print " Note: ~ will expand to %USERPROFILE%\n"; } else { print " Note: ~ will expand to \$HOME (or to %USERPROFILE% on Windows)\n"; @@ -620,7 +620,7 @@ sub input_dirname chomp (my $answer = <STDIN>); return "" if $answer eq ""; - $answer =~ s!\\!/!g if win32(); # switch to forward slashes + $answer =~ s!\\!/!g if wndws(); # switch to forward slashes if (!$noexpansion) { $answer = TeXLive::TLUtils::expand_tilde($answer); @@ -817,7 +817,7 @@ EOF EOF ; } - if ((win32() && !$vars{'instopt_portable'}) || $::opt_all_options) { + if ((wndws() && !$vars{'instopt_portable'}) || $::opt_all_options) { print " <M> Start menu shortcuts / launcher: ".obutton( $vars{'tlpdbopt_desktop_integration'}, \@::deskintdesc)."\n"; print " <N> update file associations: ".obutton( @@ -828,7 +828,7 @@ EOF } } } - if (win32() || $::opt_all_options) { + if (wndws() || $::opt_all_options) { print " <W> install TeXworks front end: $b_addoneditor\n"; } if ($media ne "NET") { @@ -847,7 +847,7 @@ EOF print "New value for binary directory [$sys_bin]: "; chomp($answer=<STDIN>); $vars{'tlpdbopt_sys_bin'} = "$answer" if (length $answer); - $vars{'tlpdbopt_sys_bin'} =~ s@\\@/@g if (win32()); + $vars{'tlpdbopt_sys_bin'} =~ s@\\@/@g if (wndws()); $vars{'tlpdbopt_sys_bin'} =~ s/^~/$home/; if ($vars{'tlpdbopt_sys_bin'}=~/^(.*)\/bin$/) { $vars{'tlpdbopt_sys_man'}="$1/man"; @@ -856,13 +856,13 @@ EOF print "New value for man directory [$vars{'tlpdbopt_sys_man'}]: "; chomp($answer=<STDIN>); $vars{'tlpdbopt_sys_man'}="$answer" if (length $answer); - $vars{'tlpdbopt_sys_man'} =~ s@\\@/@g if (win32()); + $vars{'tlpdbopt_sys_man'} =~ s@\\@/@g if (wndws()); $vars{'tlpdbopt_sys_man'} =~ s/^~/$home/; print "New value for info directory [$vars{'tlpdbopt_sys_info'}]: "; chomp($answer=<STDIN>); $vars{'tlpdbopt_sys_info'}="$answer" if (length $answer); - $vars{'tlpdbopt_sys_info'} =~ s@\\@/@g if (win32()); + $vars{'tlpdbopt_sys_info'} =~ s@\\@/@g if (wndws()); $vars{'tlpdbopt_sys_info'} =~ s/^~/$home/; } return $command{'self'}; @@ -877,7 +877,7 @@ EOF # # tlpdbopt_desktop_integration, tlpdbopt_file_assocs # -# if (win32() || $::opt_all_options) { +# if (wndws() || $::opt_all_options) { # if ("\u$answer" eq 'M' and !$vars{'instopt_portable'}) { # toggle 'tlpdbopt_desktop_integration'; # return $command{'self'}; @@ -933,7 +933,7 @@ EOF } elsif (defined $command{"\u$answer"}) { return $command{"\u$answer"}; - } elsif (("\u$answer" eq 'W') && ($::opt_all_options || win32()) && + } elsif (("\u$answer" eq 'W') && ($::opt_all_options || wndws()) && !$opt_in_place ) { toggle 'collection-texworks'; return $command{'self'}; @@ -1021,7 +1021,7 @@ sub main_menu { my $b_fmt=button($vars{'tlpdbopt_create_formats'}); my $b_letter=button($vars{'instopt_letter'}); my $b_deskint=button($vars{'tlpdbopt_desktop_integration'}, \@::deskintdesc); - if (win32()) { + if (wndws()) { my $b_fileassoc=button($vars{'tlpdbopt_file_assocs'}, \@::fileassocdesc); } my $b_admin=button($vars{'tlpdbopt_w32_multi_user'}); @@ -1131,7 +1131,7 @@ EOF print " $b_src install macro/font source tree\n"; } } - if (win32()) { + if (wndws()) { if (!$vars{'instopt_portable'}) { print " $b_path adjust search path\n"; print " $b_deskint add menu items, shortcuts, etc.\n"; @@ -1144,7 +1144,7 @@ EOF } print " $b_path create symlinks to standard directories\n" - unless ($vars{'instopt_portable'} || win32()); + unless ($vars{'instopt_portable'} || wndws()); print " $b_adjustrepo after install, set CTAN as source " . "for package updates\n" diff --git a/Master/tlpkg/installer/tl-cmd.bat b/Master/tlpkg/installer/tl-cmd.bat index 747d3088239..18431d644eb 100755 --- a/Master/tlpkg/installer/tl-cmd.bat +++ b/Master/tlpkg/installer/tl-cmd.bat @@ -9,7 +9,7 @@ rem Public domain setlocal enableextensions rem Add bin dir to beginning of PATH only if it is not already there -for /f "tokens=1,2 delims=;" %%I in ("%~dp0..\..\bin\win32;%PATH%") do if not "%%~fI"=="%%~fJ" set "PATH=%%~fI;%PATH%" +for /f "tokens=1,2 delims=;" %%I in ("%~dp0..\..\bin\windows;%PATH%") do if not "%%~fI"=="%%~fJ" set "PATH=%%~fI;%PATH%" rem Start new console start "TeX Live" "%COMSPEC%" |