Changeset 20933 for gsdl/trunk/bin/script

Timestamp:

2009-11-12T14:41:39+13:00 (14 years ago)

Author:

oranfry

Message:

modifications to environment vars LD_LIBRARY_PATH and PATH relating to wvWare on linux to be done in a narrower scope. this also fixes a probable bug which would have stopped the newer wvWare being used

File:

• gsdl/trunk/bin/script/gsConvert.pl (modified) (1 diff)

gsdl/trunk/bin/script/gsConvert.pl

@@ -494 +494 @@
     ($input_filename, $output_filestem) = @_;
 
-    my $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", 
-                     $ENV{'GSDLOS'}, "wvWare");
+    my $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wvWare");
+
+    if ( -d "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv" && $ENV{'GSDLOS'} eq "linux" ) {
+        $ENV{'PATH'} = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv/bin:$ENV{'PATH'}";
+        $ENV{'LD_LIBRARY_PATH'} = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv/lib:$ENV{'LD_LIBRARY_PATH'}";
+        $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wv", "bin", "wvWare");
+    }
 
     # don't include path on windows (to avoid having to play about