Changeset 15355

Timestamp:

2008-05-07T14:26:51+12:00 (16 years ago)

Author:

oranfry

Message:

In gs3setup.bat, use the temp directory speicified in the TMP environment variable for all temp files

File:

• greenstone3/trunk/gs3-setup.bat (modified) (2 diffs)

greenstone3/trunk/gs3-setup.bat

@@ -9 +9 @@
 :start
 :: ---- Set the GSDL3HOME variable to the current directory ----
-cd | winutil\setvar.exe GSDL3SRCHOME > %SystemRoot%\Temp\setgsdl3.bat
-call %SystemRoot%\Temp\setgsdl3.bat
-del %SystemRoot%\Temp\setgsdl3.bat
+cd | winutil\setvar.exe GSDL3SRCHOME > %TMP%\setgsdl3.bat
+call %TMP%\setgsdl3.bat
+del %TMP%\setgsdl3.bat
 set GSDL3HOME=%GSDL3SRCHOME%\web
 
@@ -25 +25 @@
 if "%GS_CP_SET%" == "yes" goto skipSetCp
 set CLASSPATH=.;%GSDL3HOME%\WEB-INF\classes;%GSDL3SRCHOME%\resources\java;%CLASSPATH%
-if exist %SystemRoot%\Temp\setcp.bat del %SystemRoot%\Temp\setcp.bat
-for %%j in ("%GSDL3SRCHOME%"\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat
-for %%j in ("%GSDL3HOME%"\WEB-INF\lib\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat
-for %%j in ("%GSDL3SRCHOME%"\lib\jni\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat
-for %%j in ("%TOMCAT_HOME%"\common\endorsed\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat
-for %%j in ("%GSDL3SRCHOME%"\build\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat
-echo set GS_CP_SET=yes >> %SystemRoot%\Temp\setcp.bat
-call %SystemRoot%\Temp\setcp.bat
-del %SystemRoot%\Temp\setcp.bat
+if exist %TMP%\setcp.bat del %TMP%\setcp.bat
+for %%j in ("%GSDL3SRCHOME%"\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
+for %%j in ("%GSDL3HOME%"\WEB-INF\lib\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
+for %%j in ("%GSDL3SRCHOME%"\lib\jni\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
+for %%j in ("%TOMCAT_HOME%"\common\endorsed\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
+for %%j in ("%GSDL3SRCHOME%"\build\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
+echo set GS_CP_SET=yes >> %TMP%\setcp.bat
+call %TMP%\setcp.bat
+del %TMP%\setcp.bat
 :skipSetCp
 
-winutil\search4j.exe -m %java_min_version% | winutil\setvar.exe _JRE_HOME > %SystemRoot%\Temp\set_jre_home.bat
-call %SystemRoot%\Temp\set_jre_home.bat
-del %SystemRoot%\Temp\set_jre_home.bat
+winutil\search4j.exe -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
 
-echo %_JRE_HOME%\bin\java.exe | winutil\setvar.exe RUNJAVA > %SystemRoot%\Temp\setrunjava.bat
-call %SystemRoot%\Temp\setrunjava.bat
-del %SystemRoot%\Temp\setrunjava.bat
+echo %_JRE_HOME%\bin\java.exe | winutil\setvar.exe RUNJAVA > %TMP%\setrunjava.bat
+call %TMP%\setrunjava.bat
+del %TMP%\setrunjava.bat
 
 if "%JRE_HOME%" == "" set JRE_HOME=%_JRE_HOME%