Update of /cvsroot/fink/experimental/thesin/finkinfo/test
In directory sc8-pr-cvs1:/tmp/cvs-serv28188
Modified Files:
sysinfo.pl
Log Message:
More fixes for G3s since there have a reduced-clock-frequency as well
Index: sysinfo.pl
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/test/sysinfo.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sysinfo.pl 12 Dec 2002 20:26:39 -0000 1.8
+++ sysinfo.pl 12 Dec 2002 20:39:24 -0000 1.9
@@ -72,7 +72,7 @@
$MODEL = "#? $ARCH/$truetype";
}
- chomp($CPU = `ioreg -n $ARCH,$TYPE | grep clock-frequency`);
+ chomp($CPU = `ioreg -n $ARCH,$TYPE | grep '"clock-frequency" ='`);
if ($CPU =~ /.*[<](.+)[>].*/) {
$CPU = hex($1)/1000000;
if ($CPU gt 999) {
@@ -226,9 +226,9 @@
chomp($UPTIME = `uptime`);
$UPTIME =~ /.*up (.+),.+[0-9]+ user/;
$DAYS = $1;
- if ($DAYS =~ /.?(.+).?days, (.+):(.+)/) {
+ if ($DAYS =~ /.?([0-9.]+).?days, (.+):(.+)/) {
$UPTIME = sprintf("%dd, %dh, %dm", $1, $2, $3);
- } elsif ($DAYS =~ /.?(.+).?days, (.+).?hrs/) {
+ } elsif ($DAYS =~ /.?([0-9.]+).?days, (.+).?hrs/) {
$UPTIME = sprintf("%dd, %dh", $1, $2);
} elsif ($DAYS =~ /.?.?(.+):(.+)/) {
$UPTIME = sprintf("%dh, %dm", $1, $2);
-------------------------------------------------------
This sf.net email is sponsored by:
With Great Power, Comes Great Responsibility
Learn to use your power at OSDN's High Performance Computing Channel
http://hpc.devchannel.org/
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
