Changeset 23949

Timestamp:

2011-04-23T18:04:57+12:00 (13 years ago)

Author:

davidb

Message:

In hand-crafted Greenstones configured with multi-OS binaries there needs to be separate folders for OS in cgi-bin. In the near future, the SVN configuration to Greenstone will also be changed to use this out-of-the-box. This change makes it easier to switch between the two structures.

File:

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

main/trunk/greenstone2/gsicontrol.bat

@@ -3 +3 @@
 setlocal
 ::set testdone=0
+
+set cgibin=cgi-bin
+::set cgibin=cgi-bin\windows
+
 set target=%1
 set configfile=%2
@@ -45 +49 @@
 echo    configure-cgi
 echo    reset-gsdlhome [config-filename]
-echo        (Save a copy of cgi-bin/gsdlsite.cfg to preserve any customisations)
+echo        (Save a copy of %cgibin%\gsdlsite.cfg to preserve any customisations)
 echo    set-port
 echo    test-gsdlhome
@@ -167 +171 @@
 :resethome
 echo.
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" (
-    echo **** WARNING. Local changes made to %GSDLHOME%\cgi-bin\gsdlsite.cfg will be lost.
-    del "%GSDLHOME%\cgi-bin\gsdlsite.cfg"
+if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" (
+    echo **** WARNING. Local changes made to %GSDLHOME%\%cgibin%\gsdlsite.cfg will be lost.
+    del "%GSDLHOME%\%cgibin%\gsdlsite.cfg"
 )
 goto cfgweb
@@ -177 +181 @@
 :cfgweb
 :cfgcgi
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" goto cgimsg
-echo Configuring cgi-bin\gsdlsite.cfg
+if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto cgimsg
+echo Configuring %cgibin%\gsdlsite.cfg
 for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\\\\@g"') do set safepath=%%T
-bin\windows\sed.exe "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg    
+bin\windows\sed.exe "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" %cgibin%\gsdlsite.cfg.in > %cgibin%\gsdlsite.cfg  
 set safepath=
 goto cgifin
@@ -187 +191 @@
 echo WARNING: Nothing done for configure-cgi.
 echo    If you wish to regenerate the file
-echo    %GSDLHOME%\cgi-bin\gsdlsite.cfg
+echo    %GSDLHOME%\%cgibin%\gsdlsite.cfg
 echo    from scratch, delete the existing file first.
 echo.
@@ -247 +251 @@
 for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T
 
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%GSDLHOME%\cgi-bin\gsdlsite.cfg"') do set COLLECTHOME=%%G
+if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set COLLECTHOME=%%G
 if "%COLLECTHOME%" == "" set COLLECTHOME=%GSDLHOME%\collect
 for /F "delims=*" %%T in ('"echo %COLLECTHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safecollectpath=%%T