texlive[69435] Master/tlpkg/TeXLive/TLWinGoo.pm: Removed version

commits+siepo at tug.org commits+siepo at tug.org
Mon Jan 15 21:05:56 CET 2024


Revision: 69435
          https://tug.org/svn/texlive?view=revision&revision=69435
Author:   siepo
Date:     2024-01-15 21:05:55 +0100 (Mon, 15 Jan 2024)
Log Message:
-----------
Removed version test, which is no longer necessary

Modified Paths:
--------------
    trunk/Master/tlpkg/TeXLive/TLWinGoo.pm

Modified: trunk/Master/tlpkg/TeXLive/TLWinGoo.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLWinGoo.pm	2024-01-15 13:27:26 UTC (rev 69434)
+++ trunk/Master/tlpkg/TeXLive/TLWinGoo.pm	2024-01-15 20:05:55 UTC (rev 69435)
@@ -34,7 +34,6 @@
 
 =head2 DIAGNOSTICS
 
-  TeXLive::TLWinGoo::is_ten;
   TeXLive::TLWinGoo::admin;
   TeXLive::TLWinGoo::non_admin;
   TeXLive::TLWinGoo::reg_country;
@@ -91,7 +90,6 @@
   use vars qw( @ISA @EXPORT @EXPORT_OK $Registry);
   @ISA = qw( Exporter );
   @EXPORT = qw(
-    &is_ten
     &admin
     &non_admin
   );
@@ -179,36 +177,8 @@
 
 =head2 DIAGNOSTICS
 
-=over 4
-
-=item C<win_version>
-
-C<win_version> 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<is_ten>
-
-C<is_ten> 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 @@
   # 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") .



More information about the tex-live-commits mailing list.