X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fmake_archive.pl;h=b7124bbc697418cf6920e87b3df8903d65d2c9db;hp=f593bf9bae9e790e9d1081d97af737cc5c160766;hb=1f9d9ce4e7796fcd461e6be0756fd40c291b1c1f;hpb=bb4b69ac447eaabada80400b3822dcfcc27e7881

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;
 }