Changeset 20933

Show
Ignore:
Timestamp:
12.11.2009 14:41:39 (10 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

Location:
gsdl/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/bin/script/gsConvert.pl

    r19763 r20933  
    494494    ($input_filename, $output_filestem) = @_; 
    495495 
    496     my $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin",  
    497                      $ENV{'GSDLOS'}, "wvWare"); 
     496    my $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wvWare"); 
     497 
     498    if ( -d "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv" && $ENV{'GSDLOS'} eq "linux" ) { 
     499        $ENV{'PATH'} = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv/bin:$ENV{'PATH'}"; 
     500        $ENV{'LD_LIBRARY_PATH'} = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}/wv/lib:$ENV{'LD_LIBRARY_PATH'}"; 
     501        $wvWare = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wv", "bin", "wvWare"); 
     502    } 
    498503 
    499504    # don't include path on windows (to avoid having to play about 
  • gsdl/trunk/setup.bash

    r20923 r20933  
    158158  export GSDLOS 
    159159 
    160   PATH=$GSDLHOME/bin/$GSDLOS/wv/bin:$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS:$PATH 
     160  PATH=$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS:$PATH 
    161161  export PATH 
    162162   
    163   # Allow wvWare binary to find the required libraries. 
    164         if test "$GSDLOS" = "linux" ; then 
    165             LD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/wv/lib:$LD_LIBRARY_PATH" 
    166             export LD_LIBRARY_PATH 
    167          
    168         elif test "$GSDLOS" = "darwin" ; then 
    169             DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/wv/lib:$DYLD_LIBRARY_PATH" 
    170             export DYLD_LIBRARY_PATH 
    171         fi 
    172  
    173    
    174    
     163  
    175164  # Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables. 
    176165