Changeset 20234 for greenstone3

Timestamp:

2009-08-12T13:28:52+12:00 (15 years ago)

Author:

oranfry

Message:

removing a little redundancy

Location:

greenstone3/trunk

Files:

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

greenstone3/trunk/gs3-setup.bat

@@ -34 +34 @@
 :: ---- Set the CLASSPATH and PATH environment variables ----
 if "%GS_CP_SET%" == "yes" goto skipSetCp
-set CLASSPATH=%GSDL3HOME%\WEB-INF\classes;%GSDL3SRCHOME%\resources\java;%GSDL3SRCHOME%\cp.jar;%CLASSPATH%;
+set CLASSPATH=%GSDL3HOME%\WEB-INF\classes;%GSDL3SRCHOME%\resources\java;%GSDL3SRCHOME%\cp.jar;.;%CLASSPATH%;
 set PATH=%PATH%;%GSDL3SRCHOME%\bin;%GSDL3SRCHOME%\bin\script;%GSDL3SRCHOME%\lib\jni;%ANT_HOME%\bin
 
@@ -48 +48 @@
 
 :: ---- Search for java ----
-bin\search4j.exe -p "%CD%\packages\jre" -m %java_min_version% | winutil\setvar.exe _JRE_HOME > %TMP%\set_jre_home.bat
+if exist bin\search4j.exe then bin\search4j.exe -p "%CD%\packages\jre" -m %java_min_version% | winutil\setvar.exe _JRE_HOME > %TMP%\set_jre_home.bat
 call %TMP%\set_jre_home.bat
 del %TMP%\set_jre_home.bat

greenstone3/trunk/gs3-setup.sh

@@ -109 +109 @@
   #done
 
-  addtopath CLASSPATH "."
   echo "  - Adjusted CLASSPATH"