--- projects/cms/source/host/generic/statgrab.pl	2001/01/22 17:29:28	1.12
+++ projects/cms/source/host/generic/statgrab.pl	2001/01/28 19:57:40	1.16
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------
 # Machine statistics grabber
 #     $Author: pjm2 $
-#     $Id: statgrab.pl,v 1.12 2001/01/22 17:29:28 pjm2 Exp $
+#     $Id: statgrab.pl,v 1.16 2001/01/28 19:57:40 pjm2 Exp $
 #
 # A Perl script to return various information about a host machine
 # by examining the output of some common Unix/Linux commands.
@@ -21,6 +21,12 @@ $| = 1;
 # You'd be silly not to use this ;)
 use strict;
 
+# Path's
+my($topbin) = "/usr/local/sbin/top";
+my($dfbin) = "/usr/bin/df";
+my($usersbin) = "/usr/ucb/users";
+my($unamebin) = "/usr/bin/uname";
+
 # Run the following components: -
 &print_ident();
 &include_osver();
@@ -42,7 +48,7 @@ exit(0);
 # the host should check this when reading data
 # means the host must be checked and updated to work with newer versions.
 sub print_ident() {
-    print 'version statgrab.pl $Revision: 1.12 $';
+    print 'version statgrab.pl $Revision: 1.16 $';
     print "\n";
 }
 
@@ -74,7 +80,7 @@ sub print_pair($$$) {
 sub include_disk() {
     
     # Run the df program.
-    my(@df) = `df -ak`;
+    my(@df) = `$dfbin -ak`;
 
     # Go through each line of the program, looking for each thing we want.
     my($partition_no) = 0;
@@ -100,10 +106,11 @@ sub include_disk() {
 sub include_users() {
 
     # Find out all users on this machine.
-    my($users) = `users`;
-    my(@users) = split(/\s+/, $users);
-
-    my($users_count) = $#users + 1;
+    my($users) = `$usersbin`;
+    $users = "\n" unless defined $users;
+    chop $users;
+    my($users_count) = 0;
+    $users_count++ while $users =~ /\w+/g;
     my($users_list) = $users;
 
     &print_pair(1, "packet.users.count", $users_count);
@@ -116,7 +123,7 @@ sub include_users() {
 sub include_top() {
 
     # Find out some numbers from top.
-    my(@top) = `top -d2 -s1 0`;
+    my(@top) = `$topbin -d2 -s1 0`;
     my($top) = join(" ", @top);
     $top =~ s/\n//g;
 
@@ -167,11 +174,11 @@ sub include_osver() {
     # Find out details about the operating system
     # If these values remain undefined, then the print_pair
     # function shall show the value to be the string "unknown".
-    my($os_name) = `uname -s`;
-    my($os_release) = `uname -r`;
-    my($os_platform) = `uname -m`;
-    my($os_sysname) = `uname -n`;
-    my($os_version) = `uname -v`;
+    my($os_name) = `$unamebin -s`;
+    my($os_release) = `$unamebin -r`;
+    my($os_platform) = `$unamebin -m`;
+    my($os_sysname) = `$unamebin -n`;
+    my($os_version) = `$unamebin -v`;
 
     &print_pair(0, "packet.os.name", $os_name);
     &print_pair(0, "packet.os.release", $os_release);