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

Timestamp:

2011-04-28T21:13:01+12:00 (13 years ago)

Author:

ak19

Message:

More changes to do with reset-gsdlhome.

File:

• main/trunk/greenstone2/gsicontrol.sh (modified) (1 diff)

main/trunk/greenstone2/gsicontrol.sh

@@ -146 +146 @@
 
 # forces configure-cgi by deleting gsdlsite.cfg
-function reset-gsdlhome {    
+function reset-gsdlhome {
+    echo "" ;
     if test -e "$GSDLHOME/$cgibin/gsdlsite.cfg" ; then
-    echo "**** WARNING. Local changes made to $GSDLHOME/$cgibin/gsdlsite.cfg will be lost.";
-    rm -f "$GSDLHOME/$cgibin/gsdlsite.cfg";
-    fi
-
+        /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
+
+    log4jprop=$GSDLHOME/lib/java/log4j.properties
+    sed "s^@gsdl2home@^$GSDLHOME^g" "$log4jprop.in" > "$log4jprop"
+    
     sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gs2-server.app/Contents/document.wflow.in" > "gs2-server.app/Contents/document.wflow"
     sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gli.app/Contents/document.wflow.in" > "gli.app/Contents/document.wflow"