From: apeiron <apeiron@bd8105ee-0ff8-0310-8827-fb3f25b6796d>
Date: Thu, 6 Aug 2009 02:51:35 +0000 (+0000)
Subject: - Fix Win32 / Cygwin detection (emazep).
X-Git-Tag: 1.006009~66
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=commitdiff_plain;h=f58534b14f1482466a4cf474d80f7c9e331b7c86

- Fix Win32 / Cygwin detection (emazep).


git-svn-id: http://dev.catalyst.perl.org/repos/bast/local-lib/1.000/trunk@7239 bd8105ee-0ff8-0310-8827-fb3f25b6796d
---

diff --git a/Changes b/Changes
index eb4c813..7708d96 100644
--- a/Changes
+++ b/Changes
@@ -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
diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index cd058f1..7ceb993 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -11,7 +11,7 @@ use File::Path ();
 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 @@ sub print_environment_vars_for {
       }
   };
 
-  # 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 {