Changeset 16442

Timestamp:

2008-07-16T18:44:44+12:00 (16 years ago)

Author:

ak19

Message:

Fixed yesterday's adjustment to envvar_prepend and envvar_append to work on Windows now (escapes windows backslashes in paths).

File:

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

gsdl/trunk/perllib/util.pm

@@ -627 +627 @@
     my ($var,$val) = @_;
 
-    my $current_val = $ENV{$var};
-    
     # do not prepend any value/path that's already in the environment variable
-    if($ENV{$var} !~ m/$val/) { 
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-        $ENV{$var} .= "$val;$current_val";
-    }
-    else {
-        $ENV{$var} .= "$val:$current_val";
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) 
+    {
+    my $escaped_val = $val;
+    $escaped_val =~ s/\\/\\\\/g; # escape any Windows backslashes for upcoming regex
+    if($ENV{$var} !~ m/$escaped_val/) { 
+        $ENV{$var} = "$val;".$ENV{$var};
+    }
+    }
+    else {
+    if($ENV{$var} !~ m/$val/) { 
+        $ENV{$var} = "$val:".$ENV{$var};
     }
     }
@@ -644 +647 @@
 
     # do not append any value/path that's already in the environment variable
-    if($ENV{$var} !~ m/$val/) { 
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) 
+    {
+    my $escaped_val = $val;
+    $escaped_val =~ s/\\/\\\\/g; # escape any Windows backslashes for upcoming regex
+    if($ENV{$var} !~ m/$escaped_val/) { 
         $ENV{$var} .= ";$val";
     }
-    else {
+    }
+    else {
+    if($ENV{$var} !~ m/$val/) { 
         $ENV{$var} .= ":$val";
     }
-    }
-}
+    }    
+}
+
 
 # splits a filename into a prefix and a tail extension using the tail_re, or