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

Timestamp:

2011-04-29T16:57:11+12:00 (13 years ago)

Author:

ak19

Message:

Further adjustments to gsicontrol.bat's configure-web and reset-gsdlhome to match the changes just committed in gsicontrol.sh

File:

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

main/trunk/greenstone2/gsicontrol.bat

@@ -176 +176 @@
 
 
-:: reset-gsdlhome forces configure-cgi by renaming any existing gsdlsite.cfg
+:: reset-gsdlhome forces configure-cgi by renaming any 
+:: existing gsdlsite.cfg and by deleting Mac .app files
 :resethome
 echo.
@@ -187 +188 @@
 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\/@g"') do set safepath=%%T
 
-:: Also re-initialise the log4j.properties and Mac's .app files
-
+:: Also re-initialise the log4j.properties and force regeneration of 
+:: Mac .app files since cfgweb will generate these if they don't exist
 ::set log4jprop=%GSDLHOME%\lib\java\log4j.properties
 ::%_sed% "s^@gsdl2home@^%GSDLHOME%^g" "%log4jprop%.in" > "%log4jprop%" 
 type "lib\java\log4j.properties.in" | %_sed% "s\@gsdl2home@\%safepath%\g" > "lib\java\log4j.properties" 
-
-type "gs2-server.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gs2-server.app\Contents\document.wflow"
-type "gli.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gli.app\Contents\document.wflow"
-type "client-gli.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "client-gli.app\Contents\document.wflow"
-type "gems.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gems.app\Contents\document.wflow"
-
+for %%G in (gs2-server.app gli.app client-gli.app gems.app) do if exist "%%G\Contents\document.wflow" del "%%G\Contents\document.wflow"
 goto cfgweb
 
@@ -204 +200 @@
 ::configure-cgi
 :cfgweb
+:: first set up Mac's .app files if that's not already been done (if this is the first time we're running GS3)
+for %%G in (gs2-server.app gli.app client-gli.app gems.app) do if not exist "%%G\Contents\document.wflow" type "%%G\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "%%G\Contents\document.wflow"
+
 :cfgcgi
 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto cgimsg