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

Timestamp:

2011-07-20T18:52:50+12:00 (12 years ago)

Author:

ak19

Message:

Improvement to code committed previously: Fixed a bug introduced with the reset-gsdlhome target where any non-standard collecthome value written into the gsdlsite.cfg was lost on startup, since reset-gsdlhome always regenerated gsdlsite.cfg from the template file. Now, the relocation code of the reset-gsdlhome target doesn't get exected every time, only when the gsdlhome property in gsdlsite.cfg is different from GSDLHOME var (which points to the current greenstone installation directory.)

File:

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

main/trunk/greenstone2/gsicontrol.bat

@@ -178 +178 @@
 :: reset-gsdlhome forces configure-cgi by renaming any 
 :: existing gsdlsite.cfg and by deleting Mac .app files
+:: However, we only relocate if there is a gsdlsite.cfg file with its gsdlhome 
+:: property the same as the current (greenstone installation) directory
 :resethome
 echo.
-if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" (
-    move "%GSDLHOME%\%cgibin%\gsdlsite.cfg" "%GSDLHOME%\%cgibin%\gsdlsite.cfg.bak"  
-    echo **** Regenerating %GSDLHOME%\%cgibin%\gsdlsite.cfg
-    echo **** Previous version of file now %GSDLHOME%\%cgibin%\gsdlsite.cfg.bak
-)
-
+if not exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto relocate
+
+FOR /F "tokens=2" %%G IN ('findstr /R ^gsdlhome "%cgibin%\gsdlsite.cfg"') do set gshome=%%G
+if "x%gshome%" == "x%GSDLHOME%" set gshome=& goto exit
+  
+move "%GSDLHOME%\%cgibin%\gsdlsite.cfg" "%GSDLHOME%\%cgibin%\gsdlsite.cfg.bak"
+echo **** Regenerating %GSDLHOME%\%cgibin%\gsdlsite.cfg
+echo **** Previous version of file now %GSDLHOME%\%cgibin%\gsdlsite.cfg.bak
+set gshome=
+
+:relocate
 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\/@g"') do set safepath=%%T
 
@@ -214 +221 @@
 %_sed% "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" "%cgibin%\gsdlsite.cfg.in" >> "%cgibin%\gsdlsite.cfg"
 set safepath=
-
-if exist "%cgibin%\gsdlsite.cfg.bak" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%cgibin%\gsdlsite.cfg.bak"') do set colhome=%%G
-if not "%colhome%" == "" echo collecthome %colhome% >> "%cgibin%\gsdlsite.cfg"& echo. >> "%cgibin%\gsdlsite.cfg"
-set colhome=
 
 goto cgifin