Changeset 16404

Timestamp:

2008-07-15T12:10:30+12:00 (15 years ago)

Author:

ak19

Message:

Subroutines envvar_prepend and envvar_append now only append a new value or path if the envvar does not already contain it. Without this, my PATH variable had grown unmanageably long.

File:

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

gsdl/trunk/perllib/util.pm

@@ -629 +629 @@
     my $current_val = $ENV{$var};
     
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-    $ENV{$var} .= "$val;$current_val";
-    }
-    else {
-    $ENV{$var} .= "$val:$current_val";
+    # 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";
+    }
     }
 }
@@ -640 +643 @@
     my ($var,$val) = @_;
 
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-    $ENV{$var} .= ";$val";
-    }
-    else {
-    $ENV{$var} .= ":$val";
+    # do not append any value/path that's already in the environment variable
+    if($ENV{$var} !~ m/$val/) { 
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+        $ENV{$var} .= ";$val";
+    }
+    else {
+        $ENV{$var} .= ":$val";
+    }
     }
 }