Changeset 17673 for gsdl/trunk

Timestamp:

2008-11-04T18:22:07+13:00 (15 years ago)

Author:

max

Message:

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

File:

• gsdl/trunk/setup.bash (modified) (1 diff)

gsdl/trunk/setup.bash

@@ -164 +164 @@
   # Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables.
 
-if test ! -z "$MAGICK_HOME" ; then
-
-    echo "Your environment variable MAGICK_HOME is already set to $MAGICK_HOME"
-    echo "Using this in preference to the version contained in Greenstone."
-    echo "If you would like to use the version bundled with Greenstone then make sure"
-    echo "the variable MAGICK_HOME is not set."
-
-else
-
-    if test -d $GSDLHOME/bin/$GSDLOS/imagemagick ; then
-    
-
-     PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/bin:$PATH"
-     export PATH
-  
-     MAGICK_HOME="$GSDLHOME/bin/$GSDLOS/imagemagick"
-     export MAGICK_HOME
-  
-     if test "$GSDLOS" = "linux" ; then
+if test -d $GSDLHOME/bin/$GSDLOS/imagemagick ; then
+    PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/bin:$PATH"
+    export PATH
+  
+    MAGICK_HOME="$GSDLHOME/bin/$GSDLOS/imagemagick"
+    export MAGICK_HOME
+  
+        if test "$GSDLOS" = "linux" ; then
             LD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/lib:$LD_LIBRARY_PATH"
             export LD_LIBRARY_PATH
         
         elif test "$GSDLOS" = "darwin" ; then
-            DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/lib:$LD_LIBRARY_PATH"
+            DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS/imagemagick/lib:$DYLD_LIBRARY_PATH"
             export DYLD_LIBRARY_PATH
-     fi
-    fi
-fi
-
-# Note: Ghostscript is only bundled with Greenstone on Mac and Windows, not on Linux.
+        fi
+fi
+
+
+  # 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
+  # for Windows please see setup.bat
 if test -d $GSDLHOME/bin/$GSDLOS/ghostscript ; then
-  PATH="$GSDLHOME/bin/$GSDLOS/ghostscript/bin":"$PATH"
-  export PATH
-  
-  GS_LIB="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/lib"
-  export GS_LIB
-
-  GS_FONTPATH="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/Resource/Font"
-  export GS_FONTPATH
+    PATH="$GSDLHOME/bin/$GSDLOS/ghostscript/bin":"$PATH"
+    export PATH
+  
+    GS_LIB="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/lib"
+    export GS_LIB
+
+    GS_FONTPATH="$GSDLHOME/bin/$GSDLOS/ghostscript/share/ghostscript/8.63/Resource/Font"
+    export GS_FONTPATH
 fi