diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-19 10:48:29 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-19 10:48:46 +0300 |
commit | d6c245d87c14e8b08208e6afa12b27e8c74d381d (patch) | |
tree | 3ea1cd15720c925a649c4a020364229dad46cb5b /set_soenv.in | |
parent | 43d7604a23a0f669f6d1bb49fe8dc16f1ebfecce (diff) |
Drop ActiveState Perl support
Why make life harder on purpose? On Cygwin, we support the Cygwin
Perl, period.
Diffstat (limited to 'set_soenv.in')
-rwxr-xr-x | set_soenv.in | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/set_soenv.in b/set_soenv.in index 375940e48a28..64f25d3bdba6 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1143,33 +1143,29 @@ elsif ($platform =~ m/cygwin/) } # Add the rest of the original path if it is still missing. - if (($^O eq "cygwin")) { # Not for ActiveState perl - my $expandedPATH = $PATH; - $expandedPATH =~ s/(\$\w+)/$1/eeg; - - # fix situations where PATH may look like /bin:"C:\blah\bleh":/ugh - my $fixedPATH = $oldPATH; - if ( $oldPATH =~ /"/ ) { - $fixedPATH = ""; - foreach my $pathentry ( split( '"',$oldPATH ) ) { - if ( ( $pathentry =~ /^$ps/ ) || ( $pathentry =~ /$ps$/ ) ) { - $fixedPATH .= $pathentry; - } else { - chomp( $pathentry = qx{cygpath -d "$pathentry"} ) ; - chomp( $pathentry = qx{cygpath -u "$pathentry"} ) ; - $fixedPATH .= $pathentry; - } - } + my $expandedPATH = $PATH; + $expandedPATH =~ s/(\$\w+)/$1/eeg; + + # fix situations where PATH may look like /bin:"C:\blah\bleh":/ugh + my $fixedPATH = $oldPATH; + if ( $oldPATH =~ /"/ ) { + $fixedPATH = ""; + foreach my $pathentry ( split( '"',$oldPATH ) ) { + if ( ( $pathentry =~ /^$ps/ ) || ( $pathentry =~ /$ps$/ ) ) { + $fixedPATH .= $pathentry; + } else { + chomp( $pathentry = qx{cygpath -d "$pathentry"} ) ; + chomp( $pathentry = qx{cygpath -u "$pathentry"} ) ; + $fixedPATH .= $pathentry; } + } + } - foreach my $pathentry (split($ps,$fixedPATH)) { - if ( ! ( $expandedPATH =~ /(?:$ps|\A)(?:$pathentry)(?:$ps|\Z)/ ) ) { - $PATH .= $ps.$pathentry; - $expandedPATH .= $ps.$pathentry; - } + foreach my $pathentry (split($ps,$fixedPATH)) { + if ( ! ( $expandedPATH =~ /(?:$ps|\A)(?:$pathentry)(?:$ps|\Z)/ ) ) { + $PATH .= $ps.$pathentry; + $expandedPATH .= $ps.$pathentry; } - } else { - $PATH .= $ps.$oldPATH; } # The path now is in cygwin posix format @@ -2180,6 +2176,9 @@ sub CheckPathExist else { # Don't check under ActiveState Perl (Windows). The path is possibly # posix and it cannot handle it. + # Hmm, but the above test also checks for existance, so presumably + # the mention of ActiveState in the above comment is just a red + # herring. return "true"; } } |