Changeset 28489 for main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

Timestamp:

2013-10-17T17:03:50+13:00 (11 years ago)

Author:

davidb

Message:

Support for Cygwin added

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

@@ -259 +259 @@
 
     $filename_full_path = &util::upgrade_if_dos_filename($filename_full_path);
-###    print STDERR "*** DirectoryPlugin::file_is_blocked $filename_full_path\n";
-
-    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+
+    if (($ENV{'GSDLOS'} =~ m/^windows$/) && ($^O ne "cygwin")) {
     # on windows, all block paths are lowercased.
     my $lower_filename = lc ($filename_full_path);
@@ -553 +552 @@
     #print STDERR "processing $raw_full_filename\n";
     # Follow Windows shortcuts
-    if ($raw_subfile =~ /(?i)\.lnk$/ && $ENV{'GSDLOS'} =~ /^windows$/i) {
+    if ($raw_subfile =~ m/(?i)\.lnk$/ && (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin"))) {
         require Win32::Shortcut;
         my $shortcut = new Win32::Shortcut(&FileUtils::filenameConcatenate($dirname, $raw_subfile));