From c4dbe7c982d00abf62e9a8927ecdef11521773a8 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 18 Jan 2024 03:01:29 +0000 Subject: CTAN sync 202401180301 --- systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm | 36 +++---------------------- 1 file changed, 3 insertions(+), 33 deletions(-) (limited to 'systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm') diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm index e468d8719a..b70f8c0d69 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm @@ -1,4 +1,4 @@ -# $Id: TLWinGoo.pm 65994 2023-02-20 23:40:00Z karl $ +# $Id: TLWinGoo.pm 69435 2024-01-15 20:05:55Z siepo $ # TeXLive::TLWinGoo.pm - Windows goop. # Copyright 2008-2023 Siep Kroonenberg, Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -13,7 +13,7 @@ package TeXLive::TLWinGoo; -my $svnrev = '$Revision: 65994 $'; +my $svnrev = '$Revision: 69435 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -34,7 +34,6 @@ C -- TeX Live Windows-specific support =head2 DIAGNOSTICS - TeXLive::TLWinGoo::is_ten; TeXLive::TLWinGoo::admin; TeXLive::TLWinGoo::non_admin; TeXLive::TLWinGoo::reg_country; @@ -91,7 +90,6 @@ BEGIN { use vars qw( @ISA @EXPORT @EXPORT_OK $Registry); @ISA = qw( Exporter ); @EXPORT = qw( - &is_ten &admin &non_admin ); @@ -179,36 +177,8 @@ if ($is_win) { =head2 DIAGNOSTICS -=over 4 - -=item C - -C returns the Windows version number as stored in the -registry: 5.0 for Windows 2000, 5.1 for Windows XP and 6.0 for Vista. - =cut -my $windows_version = 0; -my $windows_subversion = 0; - -if ($is_win) { - my $ver = `ver`; - chomp $ver; - $ver =~ s/^[^0-9]*//; - $ver =~ s/[^0-9.]*$//; - ($windows_version = $ver) =~ s/\..*$//; - ($windows_subversion = $ver) =~ s/^[^\.]*\.//; - $windows_subversion =~ s/\..*$//; -} - -=item C - -C returns 1 if windows version is >= 10.0, otherwise 0. - -=cut - -sub is_ten { return $windows_version >= 10; } - # permissions with which we try to access the system environment my $is_admin = 1; @@ -1272,7 +1242,7 @@ UNEND3 # but not for a user install under win10 because then # it shows up in Settings / Apps / Apps & features, # where it will trigger an inappropriate UAC prompt - if (admin() || !is_ten()) { + if (admin()) { &log("Registering uninstaller\n"); my $k; my $uninst_key = $Registry -> Open((admin() ? "LMachine" : "CUser") . -- cgit v1.2.3