Changeset 14362

Timestamp:

2007-08-13T12:27:36+12:00 (17 years ago)

Author:

qq6

Message:

updated util.pm

File:

• gsdl/trunk/perllib/util.pm (modified) (3 diffs)

gsdl/trunk/perllib/util.pm

@@ -26 +26 @@
 package util;
 
+BEGIN {                                                             
+    die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};       
+    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};           
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");                     
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");                
+}                                                                   
 use File::Copy;
 use File::Basename;
@@ -380 +386 @@
     # link not supported on windows 9x
     if (($ENV{'GSDLOS'} =~ /^windows$/i) && (Win32::FsType() !~ /^ntfs$/i)) {
-    print STDERR "util::hard_link: win32: using copy for hard link.\n";
-    &File::Copy::copy ($src, $dest);
-
-    } elsif (!link($src, $dest)) {
-    print STDERR "util::hard_link: unable to create hard link. ";
-    print STDERR " Attempting to copy file: $src -> $dest\n";
-    &File::Copy::copy ($src, $dest);
+        print STDERR "util::hard_link: win32: using copy for hard link.\n";
+        &File::Copy::copy ($src, $dest);
+    } else {
+        require Win32::Hardlink;
+        if (!link($src, $dest)) {
+            print STDERR "util::hard_link: unable to create hard link. ";
+            print STDERR " Attempting to copy file: $src -> $dest\n";
+            &File::Copy::copy ($src, $dest);
+        }
     }
     return 0;
@@ -410 +418 @@
     # symlink not supported on windows
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-      
         if ( (Win32::FsType() =~ /^ntfs$/i) && 
             ($src =~ /^.:\\.*/) && ($dest =~ /^.:\\.*/) &&
             (substr($src,0,3) eq substr($dest,0,3)) ) {
-        
             # if filesystem is NTFS and both source and destination is on the same local drive,
             # use hardlink instead of symlink
-            #print STDERR "util::soft_link: win32: using hard link instead of soft ink.\n"; 
-        require Win32::Hardlink;
-        hard_link($src,$dest);
+            #print STDERR "util::soft_link: win32: using hard link instead of soft ink.\n";
+            hard_link($src,$dest);
         } else {
             #print STDERR "util::soft_link: win32: using copy for soft link.\n ";