- Timestamp:
- 2011-04-28T21:13:01+12:00 (13 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/gsicontrol.bat
r23964 r23966 3 3 setlocal 4 4 ::set testdone=0 5 set startdir=%CD% 6 ::cd /d "%~dp0" 7 if "%GSDLHOME%" == "" goto testgsdl 8 cd "%GSDLHOME%" 9 10 ::set _sed="%GSDLHOME%\bin\windows\sed.exe" 11 :: NOTE: no quotes allowed around the following, since it's used inside 12 :: a FOR statement executing a command already embedded in quotes 13 set _sed=bin\windows\sed.exe 5 14 6 15 set cgibin=cgi-bin … … 15 24 :: Construct the signal using the unique GS2 installation 16 25 :: directory (after replacing spaces, colons and backslashes) 17 if "%GSDLHOME%" == "" goto testgsdl18 26 set signal=%GSDLHOME: =_% 19 for /F "delims=*" %%T in ('"echo %signal%| bin\windows\sed.exes@[\\:]@_@g"') do set signal=%%T27 for /F "delims=*" %%T in ('"echo %signal%| %_sed% s@[\\:]@_@g"') do set signal=%%T 20 28 set GS2_APACHE_HTTPD_SIGNAL=GS2_APACHE_HTTPD_%signal% 21 29 set signal= … … 50 58 echo configure-cgi 51 59 echo reset-gsdlhome [config-filename] 52 echo (Save a copy of %cgibin%\gsdlsite.cfg to preserve any customisations)53 60 echo set-port 54 61 echo test-gsdlhome … … 169 176 170 177 171 :: reset-gsdlhome forces configure-cgi by deleting gsdlsite.cfg178 :: reset-gsdlhome forces configure-cgi by renaming any existing gsdlsite.cfg 172 179 :resethome 173 180 echo. 174 181 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" ( 175 echo **** WARNING. Local changes made to %GSDLHOME%\%cgibin%\gsdlsite.cfg will be lost. 176 del "%GSDLHOME%\%cgibin%\gsdlsite.cfg" 177 ) 178 179 set _sed="bin\windows\sed.exe" 180 for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T 182 move "%GSDLHOME%\%cgibin%\gsdlsite.cfg" "%GSDLHOME%\%cgibin%\gsdlsite.cfg.bak" 183 echo **** Regenerating %GSDLHOME%\%cgibin%\gsdlsite.cfg 184 echo **** Previous version of file now %GSDLHOME%\%cgibin%\gsdlsite.cfg.bak 185 ) 186 187 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\/@g"') do set safepath=%%T 188 189 :: Also re-initialise the log4j.properties and Mac's .app files 190 191 ::set log4jprop=%GSDLHOME%\lib\java\log4j.properties 192 ::%_sed% "s^@gsdl2home@^%GSDLHOME%^g" "%log4jprop%.in" > "%log4jprop%" 193 type "lib\java\log4j.properties.in" | %_sed% "s\@gsdl2home@\%safepath%\g" > "lib\java\log4j.properties" 181 194 182 195 type "gs2-server.app\Contents\document.wflow.in" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" > "gs2-server.app\Contents\document.wflow" … … 194 207 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto cgimsg 195 208 echo Configuring %cgibin%\gsdlsite.cfg 196 for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exes@\\@\\\\@g"') do set safepath=%%T197 bin\windows\sed.exe"s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" %cgibin%\gsdlsite.cfg.in > %cgibin%\gsdlsite.cfg209 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\\\\@g"') do set safepath=%%T 210 %_sed% "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" %cgibin%\gsdlsite.cfg.in > %cgibin%\gsdlsite.cfg 198 211 set safepath= 199 212 goto cgifin … … 259 272 goto exit 260 273 ) 261 if "%_sed%" == "" set _sed="bin\windows\sed.exe" 262 if "%safepath%" == "" for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T 274 if "%safepath%" == "" for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\/@g"') do set safepath=%%T 263 275 264 276 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set COLLECTHOME=%%G 265 277 if "%COLLECTHOME%" == "" set COLLECTHOME=%GSDLHOME%\collect 266 for /F "delims=*" %%T in ('"echo %COLLECTHOME%| bin\windows\sed.exes@\\@\/@g"') do set safecollectpath=%%T278 for /F "delims=*" %%T in ('"echo %COLLECTHOME%| %_sed% s@\\@\/@g"') do set safecollectpath=%%T 267 279 268 280 … … 288 300 289 301 :exit 302 cd "%startdir%" 303 set startdir= 290 304 endlocal -
main/trunk/greenstone2/gsicontrol.sh
r23963 r23966 146 146 147 147 # forces configure-cgi by deleting gsdlsite.cfg 148 function reset-gsdlhome { 148 function reset-gsdlhome { 149 echo "" ; 149 150 if test -e "$GSDLHOME/$cgibin/gsdlsite.cfg" ; then 150 echo "**** WARNING. Local changes made to $GSDLHOME/$cgibin/gsdlsite.cfg will be lost."; 151 rm -f "$GSDLHOME/$cgibin/gsdlsite.cfg"; 152 fi 153 151 /bin/mv "$GSDLHOME/$cgibin/gsdlsite.cfg" "$GSDLHOME/$cgibin/gsdlsite.cfg.bak" ; 152 echo "**** Regenerating $GSDLHOME/$cgibin/gsdlsite.cfg" ; 153 echo "**** Previous version of file now $GSDLHOME/$cgibin/gsdlsite.cfg.bak" ; 154 fi 155 156 log4jprop=$GSDLHOME/lib/java/log4j.properties 157 sed "s^@gsdl2home@^$GSDLHOME^g" "$log4jprop.in" > "$log4jprop" 158 154 159 sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gs2-server.app/Contents/document.wflow.in" > "gs2-server.app/Contents/document.wflow" 155 160 sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gli.app/Contents/document.wflow.in" > "gli.app/Contents/document.wflow"
Note:
See TracChangeset
for help on using the changeset viewer.