From e47049d74ad1dc7ee5c54336756b9c30bae16cf4 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Tue, 1 Aug 2006 05:26:00 +0000
Subject: Bug 346545: checksetup should show the name and version of the OS
 it's being run on Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module
 owner) r=colin, a=myk

---
 checksetup.pl | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'checksetup.pl')

diff --git a/checksetup.pl b/checksetup.pl
index a9cb77514..889b363af 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -224,6 +224,7 @@ use 5.008;
 use File::Basename;
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
+use POSIX ();
 use Safe;
 
 BEGIN { chdir dirname($0); }
@@ -269,8 +270,19 @@ our %answer = %{read_answers_file()};
 my $silent = scalar(keys %answer) && !$switch{'verbose'};
 
 # Display version information
-printf "\n*** This is Bugzilla " . BUGZILLA_VERSION . " on perl %vd ***\n", 
-    $^V unless $silent;
+unless ($silent) {
+    printf "\n* This is Bugzilla " . BUGZILLA_VERSION . " on perl %vd\n",
+           $^V;
+    my @os_details = POSIX::uname;
+    # 0 is the name of the OS, 2 is the major version,
+    my $os_name = $os_details[0] . ' ' . $os_details[2];
+    if (ON_WINDOWS) {
+        require Win32;
+        $os_name = Win32::GetOSName();
+    }
+    # 3 is the minor version.
+    print "* Running on $os_name $os_details[3]\n"
+}
 
 # Check required --MODULES--
 my $module_results = check_requirements(!$silent);
-- 
cgit v1.2.3-24-g4f1b