Changeset 17667

Timestamp:

2008-11-03T19:39:27+13:00 (15 years ago)

Author:

max

Message:

Add the paths to ImageMagick and Ghostscript that are now bundled with Greenstone 2 and 3 on some platforms.

File:

• gsdl/trunk/setup.bash (modified) (3 diffs)

gsdl/trunk/setup.bash

@@ -159 +159 @@
   PATH=$PATH:$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS
   export PATH
+
+  
+  
+  # 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
+            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"
+            export DYLD_LIBRARY_PATH
+     fi
+    fi
+fi
+
+# Note: Ghostscript is only bundled with Greenstone on Mac and Windows, not on Linux.
+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
+fi
+  
+  
+  
   MANPATH=$MANPATH:$GSDLHOME/packages/mg/man
   export MANPATH
@@ -183 +231 @@
 unset gsdltoenc
 
-if [ -e ext ] ; then
+if test -e ext ; then
   for gsdl_ext in ext/* ; do
     cd $gsdl_ext > /dev/null
-    if [ -e setup.bash ] ; then 
-      . setup.bash 
+    if test -e setup.bash ; then 
+      . ./setup.bash 
     fi 
     cd ../..  
@@ -193 +241 @@
 fi
 
-if [ -e local ] ; then
-  export PATH=$GSDLHOME/local/bin:$PATH
-  export LD_LIBRARY_PATH=$GSDLHOME/local/lib:$LD_LIBRARY_PATH
-fi
-
-
+if test -e local ; then
+  PATH=$GSDLHOME/local/bin:$PATH
+  export PATH
+  LD_LIBRARY_PATH=$GSDLHOME/local/lib:$LD_LIBRARY_PATH
+  export LD_LIBRARY_PATH
+fi
+
+