Changeset 15165

Timestamp:

2008-04-02T18:11:24+13:00 (16 years ago)

Author:

ak19

Message:

Modified soft_link method to take an extra parameter ensure_paths_absolute, and if set it will check whether absolute paths are given for src and dest else make them absolute paths

File:

• gsdl/trunk/perllib/util.pm (modified) (1 diff)

gsdl/trunk/perllib/util.pm

@@ -395 +395 @@
 # make soft link to file if supported by OS, otherwise copy file
 sub soft_link {
-    my ($src, $dest) = @_;
+    my ($src, $dest, $ensure_paths_absolute) = @_;
 
     # remove trailing slashes from source and destination files
     $src =~ s/[\\\/]+$//;
     $dest =~ s/[\\\/]+$//;
+
+    # Ensure file paths are absolute IF requested to do so 
+    # Soft_linking didn't work for relative paths
+    if(defined $ensure_paths_absolute && $ensure_paths_absolute) {
+    # We need to ensure that the src file is the absolute path 
+    # See http://perldoc.perl.org/File/Spec.html
+    if(!File::Spec->file_name_is_absolute( $src ))  { # it's relative
+        $src = File::Spec->rel2abs($src); # make absolute
+    }
+    # Might as well ensure that the destination file's absolute path is used
+    if(!File::Spec->file_name_is_absolute( $dest )) {
+        $dest = File::Spec->rel2abs($dest); # make absolute
+    }
+    }
 
     # a few sanity checks