Changeset 23945

Timestamp:

2011-04-21T18:01:39+12:00 (13 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:

• gsicontrol.bat (modified) (3 diffs)
• gsicontrol.sh (modified) (3 diffs)

main/trunk/greenstone2/gsicontrol.bat

@@ -44 +44 @@
 echo    configure-apache [config-filename]
 echo    configure-cgi
+echo    reset-gsdlhome [config-filename]
+echo        (Save a copy of cgi-bin/gsdlsite.cfg to preserve any customisations)
 echo    set-port
 echo    test-gsdlhome
@@ -81 +83 @@
 if "%target%" == "configure-apache" goto cfgapach
 if "%target%" == "configure-cgi" goto cfgcgi
+if "%target%" == "reset-gsdlhome" goto resethome
 :: already tested gsdlhome (and web-stop-tested) above, don't want to keep looping on it
 if "%target%" == "test-gsdlhome" goto exit
@@ -161 +164 @@
 
 
+:: reset-gsdlhome forces configure-cgi by deleting gsdlsite.cfg
+: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"
+)
+goto cfgweb
+
 ::configure-web
 ::configure-cgi

main/trunk/greenstone2/gsicontrol.sh

@@ -139 +139 @@
 }
 
+# forces configure-cgi by deleting gsdlsite.cfg
+function reset-gsdlhome {    
+    if test -e "$GSDLHOME/cgi-bin/gsdlsite.cfg" ; then
+    echo "**** WARNING. Local changes made to $GSDLHOME/cgi-bin/gsdlsite.cfg will be lost.";
+    rm -f "$GSDLHOME/cgi-bin/gsdlsite.cfg";
+    fi
+    configure-web $1
+}
+
 function web-status {
     test-gsdlhome
@@ -211 +220 @@
     echo "   configure-apache [config-filename]"
     echo "   configure-cgi"
+    echo "   reset-gsdlhome [config-filename]\n\t(Save a copy of cgi-bin/gsdlsite.cfg to preserve any customisations)"
     echo "   test-gsdlhome"
     echo "   web-stop-tested"
@@ -249 +259 @@
     set-port)
     configure-port-and-connection;;
+    reset-gsdlhome)
+    reset-gsdlhome;;
     test-gsdlhome)
     test-gsdlhome;;