summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLUtils.pm
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-18 21:56:02 +0000
committerKarl Berry <karl@freefriends.org>2016-04-18 21:56:02 +0000
commit182f384a817a982e1f078a496b68cae8edacb777 (patch)
tree719955507e6bdb01136c37ffc2161f623735db26 /Master/tlpkg/TeXLive/TLUtils.pm
parent64cac8b0408d6a7e0700efdd53dee0414f6c8bcb (diff)
just check for ^MSWin, not 32|64; who knows what the future will bring
git-svn-id: svn://tug.org/texlive/trunk@40600 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLUtils.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index eec6b91f686..bfdb55d1087 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -222,7 +222,7 @@ $::opt_verbosity = 0; # see process_logging_options
=item C<platform>
-If C<$^O=~/MSWin(32|64)$/i> is true we know that we're on
+If C<$^O =~ /MSWin/i> is true we know that we're on
Windows and we set the global variable C<$::_platform_> to C<win32>.
Otherwise we call C<platform_name> with the output of C<config.guess>
as argument.
@@ -2207,7 +2207,7 @@ sub setup_programs {
$::progs{'xz'} = "xz";
$::progs{'tar'} = "tar";
- if ($^O =~ /^MSWin(32|64)$/i) {
+ if ($^O =~ /^MSWin/i) {
$::progs{'wget'} = conv_to_w32_path("$bindir/wget/wget.exe");
$::progs{'tar'} = conv_to_w32_path("$bindir/tar.exe");
$::progs{'xzdec'} = conv_to_w32_path("$bindir/xz/xzdec.exe");
@@ -3659,7 +3659,7 @@ sub test_one_gpg {
my $prg = shift;
my $cmdline;
debug("Testing for gpg in $prg\n");
- if ($^O =~ /^MSWin(32|64)$/i) {
+ if ($^O =~ /^MSWin/i) {
# Perl on Windows somehow does not allow calling a program
# without a full path - at least a call to "gpg" tells me
# that "c:/Users/norbert/gpg" is not recognized ...
@@ -3697,7 +3697,7 @@ sub setup_gpg {
$prg = test_one_gpg('gpg2');
$found = 1 if ($prg);
}
- if (!$found && $^O =~ /^MSWin(32|64)$/i) {
+ if (!$found && $^O =~ /^MSWin/i) {
# test on windows also a shipped version from texlive.gpg.win32
if (-r "$master/tlpkg/installer/gpg/gpg.exe") {
$prg = "$master/tlpkg/installer/gpg/gpg.exe";