From: David Leadbeater <redacted>
Date: Sat, 10 Jan 2015 18:02:02 +0000 (+0000)
Subject: Fix PCI info for kernels without /proc, detect wireless cards too
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5ed28b18d271d7fb4706fc85c4ca38f27d96353a;p=irssi-scripts.irssi.org.git

Fix PCI info for kernels without /proc, detect wireless cards too

Thanks Nei for spotting.
---

diff --git a/_data/scripts.yaml b/_data/scripts.yaml
index 06e9019..67d3c74 100644
--- a/_data/scripts.yaml
+++ b/_data/scripts.yaml
@@ -3658,11 +3658,11 @@
   contact: "dgl@dgl.cx"
   description: "Adds a /sysinfo command which prints system information (linux only)."
   filename: "sysinfo_dg.pl"
-  modified: "2008-05-17 17:39:11"
+  modified: "2014-01-1 18:01:22"
   license: "GNU GPLv2 or later"
   name: "sysinfo-dg"
   url: "http://irssi.dgl.cx/"
-  version: "1.2"
+  version: "1.3"
 
 - authors: "Juerd, Tronic"
   contact: "trn@iki.fi"
diff --git a/scripts/sysinfo_dg.pl b/scripts/sysinfo_dg.pl
index 208e4aa..360a916 100644
--- a/scripts/sysinfo_dg.pl
+++ b/scripts/sysinfo_dg.pl
@@ -2,7 +2,7 @@
 use strict;
 use Irssi 20011210.0250 ();
 use vars qw($VERSION %IRSSI);
-$VERSION = "1.2";
+$VERSION = "1.3";
 %IRSSI = (
     authors     => 'David Leadbeater',
     contact     => 'dgl@dgl.cx',
@@ -294,12 +294,12 @@ sub cpuinfo{
 
 sub pciinfo{
    my($videocard,$ethernet);
-   open(PCI, "<", "/proc/pci") or return undef;
+   open(PCI, "-|", "/sbin/lspci") or return undef;
    while(<PCI>){
       chomp;
       if(/VGA compatible controller: (.*?)$/){
          $videocard .= "${1}+ ";
-      }elsif(/Ethernet controller: (.*?)$/){
+      }elsif(/(Ethernet|Network) controller: (.*?)$/){
 	     $ethernet = $1;
       }
    }