Changeset 23975

Timestamp:

2011-04-29T17:18:33+12:00 (13 years ago)

Author:

ak19

Message:

Removed repetition in previously committed code to make it tidier and easier to maintain.

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
+    for one_file in gs2-server.app gli.app client-gli.app gems.app ; do     
+    if test ! -e "$one_file/Contents/document.wflow" ; then
+        sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "$one_file/Contents/document.wflow.in" > "$one_file/Contents/document.wflow"
+    fi
+    done ;
 
     configure-cgi
@@ -170 +163 @@
     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"
+    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