Changeset 10212

Timestamp:

2005-07-05T15:57:24+12:00 (19 years ago)

Author:

davidb

Message:

Introduction of envvar_append() to append items into an environment variable
such as PATH in a platform independent way. It is assumed the variable
passed in (typically representing a filename) is already OS compliant
(i.e. has used filename_cat() to construct it).

Location:

trunk/gsdl

Files:

• cgi-bin/gsdlCGI.pm (modified) (1 diff)
• perllib/util.pm (modified) (1 diff)

trunk/gsdl/cgi-bin/gsdlCGI.pm

@@ -214 +214 @@
     my $self = shift @_;
 
-    $ENV{'GSDLHOME'} = $self->get_gsdl_home();
-    $ENV{'GSDLOS'} = $self->get_gsdl_os();
+    my $gsdlhome = $self->get_gsdl_home();
+    my $gsdlos = $self->get_gsdl_os();
+
+    $ENV{'GSDLHOME'} = $gsdlhome;
+    $ENV{'GSDLOS'} = $gsdlos;
+
+    my $gsdl_bin_script = &util::filename_cat($gsdlhome,"bin","script");
+    &util::envvar_append("PATH",$gsdl_bin_script);
+
+    my $gsdl_bin_os = &util::filename_cat($gsdlhome,"bin",$gsdlos);
+    &util::envvar_append("PATH",$gsdl_bin_os);
 }
 

trunk/gsdl/perllib/util.pm

@@ -537 +537 @@
 
 
+sub envvar_prepend {
+    my ($var,$val) = @_;
+
+    my $current_val = $ENV{$var};
+    
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $ENV{$var} .= "$val;$current_val";
+    }
+    else {
+    $ENV{$var} .= "$val:$current_val";
+    }
+}
+
+sub envvar_append {
+    my ($var,$val) = @_;
+
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $ENV{$var} .= ";$val";
+    }
+    else {
+    $ENV{$var} .= ":$val";
+    }
+}
+
+
 # returns the path of a file without the filename -- ie. the directory the file is in
 sub filename_head {