Changeset 24787 for main/trunk/greenstone2

Timestamp:

2011-10-21T14:29:07+13:00 (13 years ago)

Author:

ak19

Message:

GSIControl.sh' reset-gsdlhome target should update the path to perl at the top of the gliserver.pl file to use the new gsdlhome. This was necessary for the equivalent Windows batch script, but the change is carried over to the .sh script for consistency.

File:

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

main/trunk/greenstone2/gsicontrol.sh

@@ -176 +176 @@
     echo "" ;
     relocate=yes ;
+
+# don't just update gsdlsite.cfg, but also the path to perl at the top of gliserver.pl
+# if this is a perl included with the Greenstone distribution
     if test -e "$GSDLHOME/$cgibin/gsdlsite.cfg" ; then
     stored_gsdlhome=`egrep "^gsdlhome" "$cgibin/gsdlsite.cfg" | awk '{print $2}'` ;
@@ -182 +185 @@
         echo "**** Regenerating $GSDLHOME/$cgibin/gsdlsite.cfg" ;
         echo "**** Previous version of file now $GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
+
+        if test -d "$GSDLHOME/bin/$GSDLOS/perl" ; then
+        gliserverfile=$GSDLHOME/$cgibin/gliserver.pl ;
+        /bin/cp "$gliserverfile" "$gliserverfile.bak" ;     
+        sed "s@$stored_gsdlhome@$GSDLHOME@g" "$gliserverfile.bak" > "$gliserverfile" ;
+        rm -f "$gliserverfile.bak" ;
+        fi
+
     else
         relocate=