Changeset 24829 for main/trunk/greenstone2/gsicontrol.bat
- Timestamp:
- 2011-11-30T17:48:15+13:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/gsicontrol.bat
r24819 r24829 1 1 @echo off 2 2 3 setlocal 3 setlocal enabledelayedexpansion 4 4 5 ::set testdone=0 5 6 set startdir=%CD% … … 25 26 :: directory (after replacing spaces, colons and backslashes) 26 27 set signal=%GSDLHOME: =_% 27 for /F "delims=*" %%T in ('"echo %signal%| %_sed%s@[\\:]@_@g"') do set signal=%%T28 for /F "delims=*" %%T in ('"echo !signal!| !_sed! s@[\\:]@_@g"') do set signal=%%T 28 29 set GS2_APACHE_HTTPD_SIGNAL=GS2_APACHE_HTTPD_%signal% 29 30 set signal= … … 164 165 echo ^<enabled^>true 165 166 echo ^<groups^>administrator,colbuilder,all-collections-editor 166 echo ^<password^> %encrypted_password%167 echo ^<password^>!encrypted_password! 167 168 echo ^<username^>admin 168 ) > " %GSDLHOME%\etc\users.txt"169 type " %GSDLHOME%\etc\users.txt" | txt2db -append "%GSDLHOME%\etc\users.gdb"170 del " %GSDLHOME%\etc\users.txt"169 ) > "!GSDLHOME!\etc\users.txt" 170 type "!GSDLHOME!\etc\users.txt" | txt2db -append "!GSDLHOME!\etc\users.gdb" 171 del "!GSDLHOME!\etc\users.txt" 171 172 ) else ( 172 173 echo Did not set password … … 185 186 186 187 set gshome= 187 FOR /F "tokens=*" %%G IN ('findstr /R ^gsdlhome " %GSDLHOME%\%cgibin%\gsdlsite.cfg"') do (call :concat %%G)188 FOR /F "tokens=*" %%G IN ('findstr /R ^gsdlhome "!GSDLHOME!\!cgibin!\gsdlsite.cfg"') do call :concat %%G 188 189 189 190 :: The following doesn't work if there are spaces in the gsdlhome filepath 190 ::FOR /F "tokens=2" %%G IN ('findstr /R ^gsdlhome " %GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set gshome=%%G191 ::FOR /F "tokens=2" %%G IN ('findstr /R ^gsdlhome "!GSDLHOME!\!cgibin!\gsdlsite.cfg"') do set gshome=%%G 191 192 :: before string comparison, remove any quotes around gsdlhome value defined in config file 192 193 :: if not [%gshome%] == [] set gshome=%gshome:"=% … … 201 202 :: The path to the included perl at the top of gliserver.pl needs to use the new gsdlhome 202 203 :: On windows, the path in gliserver.pl uses backslashes 203 for /F "delims=*" %%T in ('"echo %gshome%| %_sed%s@\\@\\\\@g"') do set safeoldhome=%%T204 for /F "delims=*" %%T in ('"echo %gsdlhome%| %_sed%s@\\@\\\\@g"') do set safenewhome=%%T204 for /F "delims=*" %%T in ('"echo !gshome!| !_sed! s@\\@\\\\@g"') do set safeoldhome=%%T 205 for /F "delims=*" %%T in ('"echo !gsdlhome!| !_sed! s@\\@\\\\@g"') do set safenewhome=%%T 205 206 if exist "%GSDLHOME%\bin\%GSDLOS%\perl" ( 206 copy " %cgibin%\gliserver.pl" "%cgibin%\gliserver.pl.bak"207 type " %cgibin%\gliserver.pl.bak" | %_sed% "s@%safeoldhome%@%safenewhome%@g" > "%cgibin%\gliserver.pl"208 del " %cgibin%\gliserver.pl.bak"207 copy "!cgibin!\gliserver.pl" "!cgibin!\gliserver.pl.bak" 208 type "!cgibin!\gliserver.pl.bak" | !_sed! "s@!safeoldhome!@!safenewhome!@g" > "!cgibin!\gliserver.pl" 209 del "!cgibin!\gliserver.pl.bak" 209 210 ) 210 211 set safenewhome= … … 212 213 set gshome= 213 214 214 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed%s@\\@\/@g"') do set safepath=%%T215 for /F "delims=*" %%T in ('"echo !GSDLHOME!| !_sed! s@\\@\/@g"') do set safepath=%%T 215 216 216 217 :: Also re-initialise the log4j.properties and force regeneration of … … 247 248 echo. >> "%cgibin%\gsdlsite.cfg" 248 249 249 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed%s@\\@\\\\@g"') do set safepath=%%T250 for /F "delims=*" %%T in ('"echo !GSDLHOME!| !_sed! s@\\@\\\\@g"') do set safepath=%%T 250 251 %_sed% "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" "%cgibin%\gsdlsite.cfg.in" >> "%cgibin%\gsdlsite.cfg" 251 252 set safepath= … … 266 267 ::configure-apache 267 268 :cfgapach 268 if not "%configfile%" == "" if exist "%configfile%" (goto cfgport) else (echo Config file %configfile%does not exist. Using default llssite.cfg)269 if not "%configfile%" == "" if exist "%configfile%" (goto cfgport) else (echo Config file !configfile! does not exist. Using default llssite.cfg) 269 270 270 271 if exist "%GSDLHOME%\llssite.cfg" ( 271 set configfile= %GSDLHOME%\llssite.cfg272 set configfile=!GSDLHOME!\llssite.cfg 272 273 goto cfgport 273 274 ) 274 275 if not exist "%GSDLHOME%\llssite.cfg.in" ( 275 echo Unable to proceed as neither %GSDLHOME%\llssite.cfg nor %GSDLHOME%\llssite.cfg.in could be found276 echo Unable to proceed as neither !GSDLHOME!\llssite.cfg nor !GSDLHOME!\llssite.cfg.in could be found 276 277 goto exit 277 278 ) … … 282 283 echo Configuring the apache webserver... 283 284 :: See http://ss64.com/nt/for_cmd.html, http://ss64.com/nt/findstr.html (and http://ss64.com/nt/find.html) 284 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^portnumber " %configfile%"') do set port=%%G285 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^hostIP " %configfile%"') do set hostIP=%%G286 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^hosts " %configfile%"') do set hosts=%%G287 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^externalaccess " %configfile%"') do set allowfromall=%%G285 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^portnumber "!configfile!"') do set port=%%G 286 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^hostIP "!configfile!"') do set hostIP=%%G 287 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^hosts "!configfile!"') do set hosts=%%G 288 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^externalaccess "!configfile!"') do set allowfromall=%%G 288 289 289 290 if "%allowfromall%" == "1" set allowfromall="Allow"& goto portcon … … 313 314 goto exit 314 315 ) 315 if "%safepath%" == "" for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed%s@\\@\/@g"') do set safepath=%%T316 if "%safepath%" == "" for /F "delims=*" %%T in ('"echo !GSDLHOME!| !_sed! s@\\@\/@g"') do set safepath=%%T 316 317 317 318 :: Doesn't work if there are spaces in the collecthome path in gsdlsite.cfg 318 ::if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome " %GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set COLLECTHOME=%%G319 ::if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "!GSDLHOME!\!cgibin!\gsdlsite.cfg"') do set COLLECTHOME=%%G 319 320 320 321 :: variable in subroutine concat is called gshome, 321 322 :: so forced to use it here for collecthome 322 323 set gshome= 323 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=*" %%G IN ('findstr /R ^collecthome " %GSDLHOME%\%cgibin%\gsdlsite.cfg"') do (call :concat %%G)324 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=*" %%G IN ('findstr /R ^collecthome "!GSDLHOME!\!cgibin!\gsdlsite.cfg"') do call :concat %%G 324 325 set COLLECTHOME=%gshome% 325 326 set gshome= 326 327 327 328 if "%COLLECTHOME%" == "" set COLLECTHOME=%GSDLHOME%\collect 328 for /F "delims=*" %%T in ('"echo %COLLECTHOME%| %_sed% s@\\@\/@g"') do set safecollectpath=%%T 329 329 for /F "delims=*" %%T in ('"echo !COLLECTHOME!| !_sed! s@\\@\/@g"') do set safecollectpath=%%T 330 330 331 331 echo Port: %port%
Note:
See TracChangeset
for help on using the changeset viewer.