Changeset 22386

Timestamp:

2010-07-13T13:42:11+12:00 (14 years ago)

Author:

davidb

Message:

Extra check added to avoid appending/prepending an environment variable when it does not exist yet

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -754 +754 @@
     my $escaped_val = $val;
     $escaped_val =~ s/\\/\\\\/g; # escape any Windows backslashes for upcoming regex
-    if($ENV{$var} !~ m/$escaped_val/) { 
+    if (!defined($ENV{$var})) {
+        $ENV{$var} = "$val";
+    }
+    elsif($ENV{$var} !~ m/$escaped_val/) { 
         $ENV{$var} = "$val;".$ENV{$var};
     }
     }
     else {
-    if($ENV{$var} !~ m/$val/) { 
+    if (!defined($ENV{$var})) {
+        $ENV{$var} = "$val";
+    }
+    elsif($ENV{$var} !~ m/$val/) { 
         $ENV{$var} = "$val:".$ENV{$var};
     }
@@ -773 +779 @@
     my $escaped_val = $val;
     $escaped_val =~ s/\\/\\\\/g; # escape any Windows backslashes for upcoming regex
-    if($ENV{$var} !~ m/$escaped_val/) { 
+    if (!defined($ENV{$var})) {
+        $ENV{$var} = "$val";
+    }
+    elsif($ENV{$var} !~ m/$escaped_val/) { 
         $ENV{$var} .= ";$val";
     }
     }
     else {
-    if($ENV{$var} !~ m/$val/) { 
+    if (!defined($ENV{$var})) {
+        $ENV{$var} = "$val";
+    }
+    elsif($ENV{$var} !~ m/$val/) { 
         $ENV{$var} .= ":$val";
     }