Changeset 24297 for main/trunk/greenstone2/gsicontrol.sh

Timestamp:

2011-07-20T18:52:50+12:00 (13 years ago)

Author:

ak19

Message:

Improvement to code committed previously: Fixed a bug introduced with the reset-gsdlhome target where any non-standard collecthome value written into the gsdlsite.cfg was lost on startup, since reset-gsdlhome always regenerated gsdlsite.cfg from the template file. Now, the relocation code of the reset-gsdlhome target doesn't get exected every time, only when the gsdlhome property in gsdlsite.cfg is different from GSDLHOME var (which points to the current greenstone installation directory.)

File:

• main/trunk/greenstone2/gsicontrol.sh (modified) (3 diffs)

main/trunk/greenstone2/gsicontrol.sh

@@ -41 +41 @@
     echo "" >> "$cgibin/gsdlsite.cfg" ;
     sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "$cgibin/gsdlsite.cfg.in" >> "$cgibin/gsdlsite.cfg" ;
-# preserve the user-assigned collecthome property, if any
-    if test -e "$GSDLHOME/$cgibin/gsdlsite.cfg.bak" ; then
-        collecthome=`egrep "^collecthome" "$cgibin/gsdlsite.cfg.bak" | awk '{print $2}'` ;
-        if test -n $collecthome ; then
-        echo "collecthome $collecthome" >> "$cgibin/gsdlsite.cfg" ;
-        echo "" >> "$cgibin/gsdlsite.cfg" ;
-        fi
-    fi
     else
     echo "WARNING: Nothing done for make configure-cgi." ;
@@ -175 +167 @@
 }
 
-# forces configure-cgi by deleting gsdlsite.cfg
+# Forces configure-cgi by renaming gsdlsite.cfg
+# but only if we actually *need* to relocate gsdlhome.
+# We relocate at all times, except when there is a gsdlsite.cfg file with its
+# gsdlhome property the same as the current (greenstone installation) directory
 function reset-gsdlhome {
     echo "" ;
+    relocate=yes ;
     if test -e "$GSDLHOME/$cgibin/gsdlsite.cfg" ; then
-    /bin/mv "$GSDLHOME/$cgibin/gsdlsite.cfg" "$GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
-    echo "**** Regenerating $GSDLHOME/$cgibin/gsdlsite.cfg" ;
-    echo "**** Previous version of file now $GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
-    fi
-
-    apache_home_os="$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH"
-
-    if test ! -e "$apache_home_os/bin/apachectl.in" ; then
-    make apache-for-dist
-    fi
+    stored_gsdlhome=`egrep "^gsdlhome" "$cgibin/gsdlsite.cfg" | awk '{print $2}'` ;
+    if [ "x$stored_gsdlhome" != "x$GSDLHOME" ]; then
+        /bin/mv "$GSDLHOME/$cgibin/gsdlsite.cfg" "$GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
+        echo "**** Regenerating $GSDLHOME/$cgibin/gsdlsite.cfg" ;
+        echo "**** Previous version of file now $GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
+    else
+        relocate=
+    fi
+    fi  
     
-    replace_list="conf/extra/httpd-dav.conf \
+    if [ "x$relocate" = "xyes" ]; then
+    apache_home_os="$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH"
+    
+    if test ! -e "$apache_home_os/bin/apachectl.in" ; then
+        make apache-for-dist
+    fi
+    
+    replace_list="conf/extra/httpd-dav.conf \
             conf/extra/httpd-manual.conf \
             conf/extra/httpd-autoindex.conf \
@@ -218 +220 @@
             include/ap_config_layout.h"
 
-    for one_file in apachectl envvars envvars-std ; do 
-    /bin/cp "$apache_home_os/bin/$one_file.in" "$apache_home_os/bin/$one_file"
-    done 
-    
-    for one_file in $replace_list ; do 
-    /bin/cp "$apache_home_os/$one_file.in" "$apache_home_os/$one_file"
-    done
-    
-    /bin/cp "$apache_home_os/bin/apr-1-config.in" "$apache_home_os/bin/apr-1-config"
-    
-    /bin/cp "$apache_home_os/bin/apu-1-config.in" "$apache_home_os/bin/apu-1-config"
-    
-    /bin/cp "$apache_home_os/build/config_vars.mk.in" "$apache_home_os/build/config_vars.mk"
-
+    for one_file in apachectl envvars envvars-std ; do 
+        /bin/cp "$apache_home_os/bin/$one_file.in" "$apache_home_os/bin/$one_file"
+    done 
+    
+    for one_file in $replace_list ; do 
+        /bin/cp "$apache_home_os/$one_file.in" "$apache_home_os/$one_file"
+    done
+    
+    /bin/cp "$apache_home_os/bin/apr-1-config.in" "$apache_home_os/bin/apr-1-config"
+    
+    /bin/cp "$apache_home_os/bin/apu-1-config.in" "$apache_home_os/bin/apu-1-config"
+    
+    /bin/cp "$apache_home_os/build/config_vars.mk.in" "$apache_home_os/build/config_vars.mk"
+    
 # replace template files with active versions. The following will generate a httpd.conf
 # file with placeholder strings, all of which we'll replace shortly hereafter.
-    bash "$apache_home_os/install-bindist.sh" "$apache_home_os"
-    
-    log4jprop=$GSDLHOME/lib/java/log4j.properties
-    sed "s^@gsdl2home@^$GSDLHOME^g" "$log4jprop.in" > "$log4jprop"
-
-    for one_file in gs2-server.app gli.app client-gli.app gems.app ; do 
-    if test -e "$one_file/Contents/document.wflow" ; then
-        rm -f "$one_file/Contents/document.wflow"
-    fi
-    done
-
-    configure-web $1
+    bash "$apache_home_os/install-bindist.sh" "$apache_home_os"
+    
+    log4jprop=$GSDLHOME/lib/java/log4j.properties
+    sed "s^@gsdl2home@^$GSDLHOME^g" "$log4jprop.in" > "$log4jprop"
+    
+    for one_file in gs2-server.app gli.app client-gli.app gems.app ; do 
+        if test -e "$one_file/Contents/document.wflow" ; then
+        rm -f "$one_file/Contents/document.wflow"
+        fi
+    done
+    
+    configure-web $1
+    fi
 }