Changeset 23987 for main/trunk/greenstone2/gsicontrol.bat

Timestamp:

2011-05-04T16:51:36+12:00 (13 years ago)

Author:

ak19

Message:

Bringing the windows scripts up to date with the linux scripts. Changes are still to do with moving resetting the server (and Greenstone) after moving Greenstone home. Now gs2-server can be launched as it is and will run from whichever folder GS is moved to, without having to explicitly call gsicontrol.bat's reset-gsdlhome target first.

File:

• main/trunk/greenstone2/gsicontrol.bat (modified) (2 diffs)

main/trunk/greenstone2/gsicontrol.bat

@@ -4 +4 @@
 ::set testdone=0
 set startdir=%CD%
-::cd /d "%~dp0"
-if "%GSDLHOME%" == "" goto testgsdl
-cd "%GSDLHOME%"
+cd /d "%~dp0"
+::we're now in the "%GSDLHOME%" folder
+call setup.bat 
 
 ::set _sed="%GSDLHOME%\bin\windows\sed.exe"
@@ -206 +206 @@
 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto cgimsg
 echo Configuring %cgibin%\gsdlsite.cfg
+echo # **** This file is automatically generated, do not edit **** > "%cgibin%\gsdlsite.cfg"
+echo # For local customization of Greenstone, edit gsdlsite.cfg.in >> "%cgibin%\gsdlsite.cfg"
+echo. >> "%cgibin%\gsdlsite.cfg"
 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\\\\@g"') do set safepath=%%T
-%_sed% "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" %cgibin%\gsdlsite.cfg.in > %cgibin%\gsdlsite.cfg   
+%_sed% "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" "%cgibin%\gsdlsite.cfg.in" >> "%cgibin%\gsdlsite.cfg"
 set safepath=
 goto cgifin