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

Timestamp:

2011-04-29T16:28:16+12:00 (13 years ago)

Author:

ak19

Message:

Adjustments to configure-web and reset-gsdlhome. Note that at present, if using an SVN version of GS2, then before you tell GS2 that you've changed its installation location, you need to first run make apache-for-dist in the top level folder. This will allow you to run the RESET-GREENSTONE.sh script in GS svn's other-projects. That script will adjust the apache config files before running gsicontrol.sh's reset-gsdlhome target.

File:

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

main/trunk/greenstone2/gsicontrol.sh

@@ -141 +141 @@
 
 function configure-web {
+    if test ! -e "gs2-server.app/Contents/document.wflow" ; then
+    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gs2-server.app/Contents/document.wflow.in" > "gs2-server.app/Contents/document.wflow"
+    fi
+    if test ! -e "gli.app/Contents/document.wflow" ; then
+    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gli.app/Contents/document.wflow.in" > "gli.app/Contents/document.wflow"
+    fi
+    if test ! -e "client-gli.app/Contents/document.wflow" ; then
+    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "client-gli.app/Contents/document.wflow.in" > "client-gli.app/Contents/document.wflow"
+    fi
+    if test ! -e "gems.app/Contents/document.wflow" ; then
+    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gems.app/Contents/document.wflow.in" > "gems.app/Contents/document.wflow"
+    fi
+
     configure-cgi
     configure-apache $1
@@ -147 +160 @@
 # forces configure-cgi by deleting gsdlsite.cfg
 function reset-gsdlhome {
-    echo "" ;
+    echo "" ;
     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
-
-    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"
-    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "client-gli.app/Contents/document.wflow.in" > "client-gli.app/Contents/document.wflow"
-    sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "gems.app/Contents/document.wflow.in" > "gems.app/Contents/document.wflow"
+    /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"
+   
+    rm -f "gs2-server.app/Contents/document.wflow"
+    rm -f "gli.app/Contents/document.wflow"
+    rm -f "client-gli.app/Contents/document.wflow"
+    rm -f "gems.app/Contents/document.wflow"
 
     configure-web $1