summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2024-01-15 20:05:55 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2024-01-15 20:05:55 +0000
commit9a719d12a7ac6c071831d3a2e3a709d95e3b0619 (patch)
treeac5f043e0b33fd179e9c3aeed6193264864b2186
parent1d2c7ffcddd834253947fec7e558192e95722f01 (diff)
Removed version test, which is no longer necessary
git-svn-id: svn://tug.org/texlive/trunk@69435 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm32
1 files changed, 1 insertions, 31 deletions
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 1517aee2f96..8eedf3b1fd3 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -34,7 +34,6 @@ C<TeXLive::TLWinGoo> -- 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<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 @@ 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") .