Changeset 23945

Show
Ignore:
Timestamp:
21.04.2011 18:01:39 (8 years ago)
Author:
ak19
Message:

First set of changes to the gsicontrol scripts to introduce the reset-gsdlhome flag. Still need to deal with the GSDLHOME placeholders in the Mac .app files and need to create their template .in files

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

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

    r23252 r23945  
    4444echo    configure-apache [config-filename] 
    4545echo    configure-cgi 
     46echo    reset-gsdlhome [config-filename] 
     47echo        (Save a copy of cgi-bin/gsdlsite.cfg to preserve any customisations) 
    4648echo    set-port 
    4749echo    test-gsdlhome 
     
    8183if "%target%" == "configure-apache" goto cfgapach 
    8284if "%target%" == "configure-cgi" goto cfgcgi 
     85if "%target%" == "reset-gsdlhome" goto resethome 
    8386:: already tested gsdlhome (and web-stop-tested) above, don't want to keep looping on it 
    8487if "%target%" == "test-gsdlhome" goto exit 
     
    161164 
    162165 
     166:: reset-gsdlhome forces configure-cgi by deleting gsdlsite.cfg 
     167:resethome 
     168echo. 
     169if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" ( 
     170    echo **** WARNING. Local changes made to %GSDLHOME%\cgi-bin\gsdlsite.cfg will be lost. 
     171    del "%GSDLHOME%\cgi-bin\gsdlsite.cfg" 
     172) 
     173goto cfgweb 
     174 
    163175::configure-web 
    164176::configure-cgi 
  • main/trunk/greenstone2/gsicontrol.sh

    r23726 r23945  
    139139} 
    140140 
     141# forces configure-cgi by deleting gsdlsite.cfg 
     142function reset-gsdlhome {     
     143    if test -e "$GSDLHOME/cgi-bin/gsdlsite.cfg" ; then 
     144    echo "**** WARNING. Local changes made to $GSDLHOME/cgi-bin/gsdlsite.cfg will be lost."; 
     145    rm -f "$GSDLHOME/cgi-bin/gsdlsite.cfg"; 
     146    fi 
     147    configure-web $1 
     148} 
     149 
    141150function web-status { 
    142151    test-gsdlhome 
     
    211220    echo "   configure-apache [config-filename]" 
    212221    echo "   configure-cgi" 
     222    echo "   reset-gsdlhome [config-filename]\n\t(Save a copy of cgi-bin/gsdlsite.cfg to preserve any customisations)" 
    213223    echo "   test-gsdlhome" 
    214224    echo "   web-stop-tested" 
     
    249259    set-port) 
    250260    configure-port-and-connection;; 
     261    reset-gsdlhome) 
     262    reset-gsdlhome;; 
    251263    test-gsdlhome) 
    252264    test-gsdlhome;;