gforge-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: cbayle
Subject: [Gforge-commits] gforge/utils install-apache.sh,1.2,1.3
Date: Sat, 17 Jan 2004 14:23:11 -0600

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

Modified Files:
        install-apache.sh 
Log Message:
Improved line removal


Index: install-apache.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/utils/install-apache.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- install-apache.sh   17 Jan 2004 01:53:56 -0000      1.2
+++ install-apache.sh   17 Jan 2004 20:23:08 -0000      1.3
@@ -27,6 +27,17 @@
     exec su -c "$0 $1"
 fi
 
+remove_gforge_insert(){
+                       cp -a $1 $1.gforge-new
+                       echo "Removing Gforge inserted lines"
+                       vi -e $1.gforge-new > /dev/null 2>&1 <<-FIN
+/### Next line inserted by GForge install
+:d
+:d
+:w
+:x
+FIN
+}
 
 search_conf_file(){
 CONFFILE=$1
@@ -98,12 +109,7 @@
                        # New apache conf       
                        # Remove old hack to have Apache see us
                        if [ -e $apacheconffile ] && grep -q "Include 
$gforgeconffile" $apacheconffile ; then
-                               cp -a $apacheconffile $apacheconffile.gforge-new
-                               pattern=$(basename $0)
-                               tmp=$(mktemp /tmp/$pattern.XXXXXX)
-                               grep -v "Include $gforgeconffile\|### Next line 
inserted by GForge install" $apacheconffile.gforge-new > $tmp
-                               cat $tmp > $apacheconffile.gforge-new
-                               rm -f $tmp
+                               remove_gforge_insert $apacheconffile
                        fi
                else    
                        # Old fashion Apache
@@ -168,13 +174,10 @@
     purge-files)
        for apacheconffile in $APACHE_ETC_LIST
        do
-               if [ -e $apacheconffile ] && grep -q "Include $gforgeconffile" 
$apacheconffile ; then
-                       cp -a $apacheconffile $apacheconffile.gforge-new
-                       pattern=$(basename $0)
-                       tmp=$(mktemp /tmp/$pattern.XXXXXX)
-                       grep -v "Include $gforgeconffile\|### Next line 
inserted by GForge install" $apacheconffile.gforge-new > $tmp
-                       cat $tmp > $apacheconffile.gforge-new
-                       rm -f $tmp
+       echo "Looking at $apacheconffile"
+               #if [ -e $apacheconffile ] && grep -q "Include $gforgeconffile" 
$apacheconffile ; then
+               if [ -e $apacheconffile ] && grep -q "### Next line inserted by 
GForge install" $apacheconffile ; then
+                       remove_gforge_insert $apacheconffile
                fi
        done
        ;;





reply via email to

[Prev in Thread] Current Thread [Next in Thread]