[Gforge-commits] gforge/utils install-apache.sh,1.3,1.4

[cbayle]

Update of /cvsroot/gforge/gforge/utils
In directory db.perdue.net:/tmp/cvs-serv22842/utils

Modified Files:
        install-apache.sh 
Log Message:
More explicit messages
Safer include in apache conf file


Index: install-apache.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/utils/install-apache.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- install-apache.sh   17 Jan 2004 20:23:08 -0000      1.3
+++ install-apache.sh   18 Jan 2004 01:56:34 -0000      1.4
@@ -29,7 +29,7 @@
 
 remove_gforge_insert(){
                        cp -a $1 $1.gforge-new
-                       echo "Removing Gforge inserted lines"
+                       echo "Removing Gforge inserted lines from $1.gforge-new"
                        vi -e $1.gforge-new > /dev/null 2>&1 <<-FIN
 /### Next line inserted by GForge install
 :d
@@ -121,8 +121,12 @@
                                perl -pi -e "s/# *LoadModule 
vhost_alias_module/LoadModule vhost_alias_module/gi" $apacheconffile.gforge-new
            
                                if ! grep -q "^Include $gforgeconffile" 
$apacheconffile.gforge-new ; then
+                                       # File cleaning, just in case
+                                       remove_gforge_insert $apacheconffile
                                        echo "### Next line inserted by GForge 
install" >> $apacheconffile.gforge-new
                                        echo "Include $gforgeconffile" >> 
$apacheconffile.gforge-new
+                               else
+                                       echo "Found Include $gforgeconffile in 
$apacheconffile"
                                fi
                        fi
                fi