Changeset 23974

Show
Ignore:
Timestamp:
29.04.2011 16:57:11 (9 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gsicontrol.bat

    r23966 r23974  
    176176 
    177177 
    178 :: reset-gsdlhome forces configure-cgi by renaming any existing gsdlsite.cfg 
     178:: reset-gsdlhome forces configure-cgi by renaming any  
     179:: existing gsdlsite.cfg and by deleting Mac .app files 
    179180:resethome 
    180181echo. 
     
    187188for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\/@g"') do set safepath=%%T 
    188189 
    189 :: Also re-initialise the log4j.properties and Mac's .app files 
    190  
     190:: Also re-initialise the log4j.properties and force regeneration of  
     191:: Mac .app files since cfgweb will generate these if they don't exist 
    191192::set log4jprop=%GSDLHOME%\lib\java\log4j.properties 
    192193::%_sed% "s^@gsdl2home@^%GSDLHOME%^g" "%log4jprop%.in" > "%log4jprop%"  
    193194type "lib\java\log4j.properties.in" | %_sed% "s\@gsdl2home@\%safepath%\g" > "lib\java\log4j.properties"  
    194  
    195 type "gs2-server.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gs2-server.app\Contents\document.wflow" 
    196 type "gli.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gli.app\Contents\document.wflow" 
    197 type "client-gli.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "client-gli.app\Contents\document.wflow" 
    198 type "gems.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gems.app\Contents\document.wflow" 
    199  
     195for %%G in (gs2-server.app gli.app client-gli.app gems.app) do if exist "%%G\Contents\document.wflow" del "%%G\Contents\document.wflow" 
    200196goto cfgweb 
    201197 
     
    204200::configure-cgi 
    205201:cfgweb 
     202:: first set up Mac's .app files if that's not already been done (if this is the first time we're running GS3) 
     203for %%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" 
     204 
    206205:cfgcgi 
    207206if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto cgimsg