Changeset 28226 for main/trunk

Timestamp:

2013-09-05T16:36:42+12:00 (11 years ago)

Author:

ak19

Message:

Related to previous commit: the test for whether the OS is Windows, to determine whether to import the Win32 package so we can use the GetLongPathName() subroutine, is now the same as in doc.pm

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -42 +42 @@
 use FileUtils;
 
-if ($^O =~ m/mswin/i) {
+if ($ENV{'GSDLOS'} =~ /^windows$/i) {
     require Win32; # for working out Windows Long Filenames from Win 8.3 short filenames
 }
@@ -1300 +1300 @@
     return $path unless is_abs_path_any_os($path); # path is relative
     
-    if ($^O =~ m/mswin/i) {
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {       
         $path = &Win32::GetLongPathName($path); 
     }