[Bast-commits] r7239 - in local-lib/1.000/trunk: . lib/local

[apeiron at dev.catalyst.perl.org]

Author: apeiron
Date: 2009-08-06 02:51:35 +0000 (Thu, 06 Aug 2009)
New Revision: 7239

Modified:
   local-lib/1.000/trunk/Changes
   local-lib/1.000/trunk/lib/local/lib.pm
Log:
- Fix Win32 / Cygwin detection (emazep).


Modified: local-lib/1.000/trunk/Changes
===================================================================
--- local-lib/1.000/trunk/Changes	2009-08-05 20:00:58 UTC (rev 7238)
+++ local-lib/1.000/trunk/Changes	2009-08-06 02:51:35 UTC (rev 7239)
@@ -1,8 +1,12 @@
 Revision history for local::lib
 
+1.004004 2009-08-05
+
         - Add dependency on Extutils::Install 1.43 and install in --bootstrap
           otherwise we fail to build with latest MakeMaker on OpenSolaris (t0m)
 
+        - Fix Win32 / Cygwin detection (emazep).
+
 1.004003 2009-16-16
         - Stop Makefile.PL exploding if your CPAN is too old to have
           CPAN::HandleConfig. Needed when installing local::lib via CPAN

Modified: local-lib/1.000/trunk/lib/local/lib.pm
===================================================================
--- local-lib/1.000/trunk/lib/local/lib.pm	2009-08-05 20:00:58 UTC (rev 7238)
+++ local-lib/1.000/trunk/lib/local/lib.pm	2009-08-06 02:51:35 UTC (rev 7239)
@@ -11,7 +11,7 @@
 use Carp ();
 use Config;
 
-our $VERSION = '1.004003'; # 1.4.3
+our $VERSION = '1.004004'; # 1.4.4
 
 sub import {
   my ($class, @args) = @_;
@@ -272,8 +272,8 @@
       }
   };
 
-  # Win32 uses this variable.
-  if (defined $ENV{'COMSPEC'}) {
+  # Both Win32 and Cygwin have $ENV{COMSPEC} set.
+  if (defined $ENV{'COMSPEC'} && $^O ne 'cygwin') {
       my @shell_bin_path_parts = File::Spec->splitpath($ENV{'COMSPEC'});
       $shellbin = $shell_bin_path_parts[-1];
          $shelltype = do {