Changeset 8067

Timestamp:

2004-08-26T12:24:01+12:00 (20 years ago)

Author:

mdewsnip

Message:

Removed GSDLHOME stuff (it is now done only when necessary -- in the gli4gs3 scripts).

Location:

trunk/gsdl3

Files:

• gs3-setup.bat (modified) (1 diff)
• gs3-setup.sh (modified) (1 diff)

trunk/gsdl3/gs3-setup.bat

@@ -14 +14 @@
 :: ---- Set other important environment variables ----
 set GSDLOS=windows
-set GSDLHOME=%GSDL3HOME%\gs2extra
-set PATH=%PATH%;%GSDL3HOME%\bin;%GSDL3HOME%\bin\script;%GSDL3HOME%\lib;%GSDL3HOME%\packages\mysql\bin;%GSDLHOME%\bin\script;%GSDLHOME%\bin\windows
+set PATH=%PATH%;%GSDL3HOME%\bin;%GSDL3HOME%\bin\script;%GSDL3HOME%\lib;%GSDL3HOME%\packages\mysql\bin
 
 :: ---- Set the CLASSPATH environment variable ----

trunk/gsdl3/gs3-setup.sh

@@ -38 +38 @@
 export GSDLOS
 
-## determine GSDLHOME for running gli under gs3
-gsdlpath=
-
-# Some users may set the above line manually
-if [ "$gsdlpath" == "" ]; then
-    # check to see if we have a gs2extra directory
-    if [ -d gs2extra ]; then
-    gsdlpath=$GSDL3HOME/gs2extra
-    # Check the environment variable    
-    elif [ "$GSDLHOME" != "" ]; then
-    gsdlpath=$GSDLHOME
-    
-    else 
-    echo "Could not determine the location of a greenstone 2 installation."
-    echo "You will be able to run greenstone3 but not use the GLI."
-    echo "To use the GLI, please run 'source setup.bash' in your gsdl installation before running this script, or set gsdlpath in the gs3-setup.sh script."
-    fi
-fi
-
-GSDLHOME=$gsdlpath
-export GSDLHOME
-
-PATH=$GSDL3HOME/packages/mysql/bin:$GSDL3HOME/bin/script:$GSDL3HOME/bin:$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS:$PATH
+PATH=$GSDL3HOME/packages/mysql/bin:$GSDL3HOME/bin/script:$GSDL3HOME/bin:$PATH
 export PATH
 MANPATH=$MANPATH:$GSDL3HOME/doc/man