From a42ccc65af95b9691000901af5b41f1aeb2b9abb Mon Sep 17 00:00:00 2001
From: fidian <fidian@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 23 Mar 2001 21:34:48 +0000
Subject: [PATCH] * More changes.  Sorry.  Shoulda made them the first time.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1205 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 plugins/make_archive.pl | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/plugins/make_archive.pl b/plugins/make_archive.pl
index f593bf9b..b7124bbc 100755
--- a/plugins/make_archive.pl
+++ b/plugins/make_archive.pl
@@ -67,13 +67,13 @@ $QuietString = " > /dev/null 2> /dev/null" if (! $Verbose);
 
 print "\n\n" if ($Verbose);
 print "Creating $Plugin.$Version-$SMVersion.tar.gz\n";
-system("tar cvfz $Plugin-$Version.tar.gz $Plugin" . FindTarExcludes(@Files)
-    . $QuietString);
+system("tar cvfz $Plugin.$Version-$SMVersion.tar.gz $Plugin" . 
+    FindTarExcludes(@Files) . $QuietString);
     
 #print "\n\n" if ($Verbose);
-#print "Creating $Plugin-$Version.zip\n";
-#system("zip -r $Plugin-$Version.zip $Plugin/" . FindZipExcludes(@Files)
-#    . $QuietString);
+#print "Creating $Plugin.$Version-$SMVersion.zip\n";
+#system("zip -r $Plugin.$Version-$SMVersion.zip $Plugin/" . 
+#    FindZipExcludes(@Files) . $QuietString);
 
 
 
@@ -100,15 +100,10 @@ sub FindTarExcludes
     {
         if ($File =~ /^(.*\/CVS)\/$/)
 	{
-	    $ExcludeStr .= " $1";
+	    $ExcludeStr .= " --exclude $1";
 	}
     }
     
-    if ($ExcludeStr ne "")
-    {
-        $ExcludeStr = " --exclude" . $ExcludeStr;
-    }
-    
     return $ExcludeStr;
 }
 
-- 
2.25.1