[csw-devel] SF.net SVN: gar:[12259] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswcptemplates

[theferret at users.sourceforge.net]

Revision: 12259
          http://gar.svn.sourceforge.net/gar/?rev=12259&view=rev
Author:   theferret
Date:     2011-01-08 15:38:37 +0000 (Sat, 08 Jan 2011)

Log Message:
-----------
minor bugfix+improvement to cswcptemplates

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates	2011-01-08 15:21:33 UTC (rev 12258)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates	2011-01-08 15:38:37 UTC (rev 12259)
@@ -106,11 +106,11 @@
 
 	##overridedir=`sed -n  's/.*CSWDESTDIR=\([^ ]*\).*/\1/p' $src`
 
-	if [ -f $preservedconf ] ; then
+	if [ -f $confdest ] ; then
+		echo $confdest already exists. Not overwriting
+	elif [ -f $preservedconf ] ; then
 		echo Restoring $preservedconf
-		cp -p $preservedconf $confdest
-	elif [ -f $confdest ] ; then
-		echo $confdest already exists. Not overwriting
+		cp -p $preservedconf $confdest && rm $preservedconf
 	else
 		echo Copying $TEMPLATEDIR/$template to $confdest
                 cp $template $confdest


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.