Changeset 4126

Timestamp:

09/01/06 09:44:54 (7 years ago)

Author:

khali

Message:

decode-edid.pl: Append /usr/sbin or /usr/local/sbin to $PATH if needed.
This is needed because parse-edid is typically installed in one of these
directories, even though any user can use it.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/eeprom/decode-edid.pl (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -43 +43 @@
                            Add memory size computation for Rambus memory
                            Various output cleanups and fixes
+  Program decode-edid.pl: Add /usr/sbin or /usr/local/sbin to $PATH if needed
   Program i2cdetect: Add a mode to print adapter functionalities
   Program i2cdump: Restore bank after bank switching

lm-sensors/trunk/prog/eeprom/decode-edid.pl

@@ -1 +1 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2003-2004 Jean Delvare <khali@linux-fr.org>
+# Copyright (C) 2003-2006 Jean Delvare <khali@linux-fr.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -24 +24 @@
 # Version 1.0  2004-02-08  Jean Delvare <khali@linux-fr.org>
 #  Added support for Linux 2.5/2.6 (i.e. sysfs).
+# Version 1.1  2006-09-01  Jean Delvare <khali@linux-fr.org>
+#  Append /usr/sbin or /usr/local/sbin to $PATH if needed.
 #
 # EEPROM data decoding for EDID. EDID (Extended Display Identification
@@ -51 +53 @@
 use constant PROCFS => 1;
 use constant SYSFS  => 2;
+
+# parse-edid will typically be installed in /usr/sbin or /usr/local/sbin
+# even though regular users can run it
+$ENV{PATH} .= ':/usr/local/sbin'
+        if $ENV{PATH} !~ m,(^|:)/usr/local/sbin/?(:|$),
+        && -x '/usr/local/sbin/parse-edid';
+$ENV{PATH} .= ':/usr/sbin'
+        if $ENV{PATH} !~ m,(^|:)/usr/sbin/?(:|$),
+        && -x '/usr/sbin/parse-edid';
 
 sub edid_valid_procfs
@@ -194 +205 @@
 {
         print STDERR
-                "decode-edid: decode-edid version 1.0\n";
+                "decode-edid: decode-edid version 1.1\n";
         if (-r "/proc/sys/dev/sensors/eeprom-i2c-$bus-$address")
         {