Changeset 17673

Show
Ignore:
Timestamp:
04.11.2008 18:22:07 (11 years ago)
Author:
max
Message:

Explain how to bypass Ghostscript/Imagemagick is now in gli.sh/.bat

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/setup.bash

    r17667 r17673  
    164164  # Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables. 
    165165 
    166 if test ! -z "$MAGICK_HOME" ; then 
    167  
    168     echo "Your environment variable MAGICK_HOME is already set to $MAGICK_HOME" 
    169     echo "Using this in preference to the version contained in Greenstone." 
    170     echo "If you would like to use the version bundled with Greenstone then make sure" 
    171     echo "the variable MAGICK_HOME is not set." 
    172  
    173 else 
    174  
    175     if test -d $GSDLHOME/bin/$GSDLOS/imagemagick ; then 
    176      
    177  
    178      PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/bin:$PATH" 
    179      export PATH 
    180    
    181      MAGICK_HOME="$GSDLHOME/bin/$GSDLOS/imagemagick" 
    182      export MAGICK_HOME 
    183    
    184      if test "$GSDLOS" = "linux" ; then 
     166if test -d $GSDLHOME/bin/$GSDLOS/imagemagick ; then 
     167    PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/bin:$PATH" 
     168    export PATH 
     169   
     170    MAGICK_HOME="$GSDLHOME/bin/$GSDLOS/imagemagick" 
     171    export MAGICK_HOME 
     172   
     173        if test "$GSDLOS" = "linux" ; then 
    185174            LD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/lib:$LD_LIBRARY_PATH" 
    186175            export LD_LIBRARY_PATH 
    187176         
    188177        elif test "$GSDLOS" = "darwin" ; then 
    189             DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/lib:$LD_LIBRARY_PATH" 
     178            DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/lib:$DYLD_LIBRARY_PATH" 
    190179            export DYLD_LIBRARY_PATH 
    191      fi 
    192     fi 
    193 fi 
    194  
    195 # Note: Ghostscript is only bundled with Greenstone on Mac and Windows, not on Linux. 
     180        fi 
     181fi 
     182 
     183 
     184  # Note: Ghostscript is only bundled with Greenstone on Mac and Windows, not on Linux. The code below should be used only for the Darwin platform 
     185  # for Windows please see setup.bat 
    196186if test -d $GSDLHOME/bin/$GSDLOS/ghostscript ; then 
    197   PATH="$GSDLHOME/bin/$GSDLOS/ghostscript/bin":"$PATH" 
    198   export PATH 
    199    
    200   GS_LIB="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/lib" 
    201   export GS_LIB 
    202  
    203   GS_FONTPATH="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/Resource/Font" 
    204   export GS_FONTPATH 
     187    PATH="$GSDLHOME/bin/$GSDLOS/ghostscript/bin":"$PATH" 
     188    export PATH 
     189   
     190    GS_LIB="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/lib" 
     191    export GS_LIB 
     192 
     193    GS_FONTPATH="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/Resource/Font" 
     194    export GS_FONTPATH 
    205195fi 
    206196