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

diff --git a/plugins/make_archive.pl b/plugins/make_archive.pl
index f593bf9b..5df90b9d 100755
--- a/plugins/make_archive.pl
+++ b/plugins/make_archive.pl
@@ -29,7 +29,7 @@ foreach $arg (@ARGV)
     else
     {
         print "Unrecognized argument:  $arg\n";
-	exit(0);
+        exit(0);
     }
 }
 
@@ -67,24 +67,24 @@ $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);
 
 
 
 sub VerifyPluginDir
 {
     local ($Plugin) = @_;
-    
+
     if (! -e $Plugin && ! -d $Plugin)
     {
         print "The $Plugin directory doesn't exist, " .
-	    "or else it is not a directory.\n";
+            "or else it is not a directory.\n";
         exit(0);
     }
 }
@@ -93,44 +93,39 @@ sub VerifyPluginDir
 sub FindTarExcludes
 {
     local (@Files) = @_;
-    
+
     $ExcludeStr = "";
-    
+
     foreach $File (@Files)
     {
         if ($File =~ /^(.*\/CVS)\/$/)
-	{
-	    $ExcludeStr .= " $1";
-	}
+        {
+            $ExcludeStr .= " --exclude $1";
+        }
     }
-    
-    if ($ExcludeStr ne "")
-    {
-        $ExcludeStr = " --exclude" . $ExcludeStr;
-    }
-    
+
     return $ExcludeStr;
 }
 
 sub FindZipExcludes
 {
     local (@Files) = @_;
-    
+
     $ExcludeStr = "";
-    
+
     foreach $File (@Files)
     {
         if ($File =~ /^(.*\/CVS)\/$/)
-	{
-	    $ExcludeStr .= " $1/ $1/*";
-	}
+        {
+            $ExcludeStr .= " $1/ $1/*";
+        }
     }
-    
+
     if ($ExcludeStr ne "")
     {
         $ExcludeStr = " -x" . $ExcludeStr;
     }
-    
+
     return $ExcludeStr;
 }
 
@@ -138,25 +133,25 @@ sub RecurseDir
 {
     local ($Dir) = @_;
     local (@Files, @Results);
-    
+
     opendir(DIR, $Dir);
     @Files = readdir(DIR);
     closedir(DIR);
-    
+
     @Results = ("$Dir/");
-    
+
     foreach $file (@Files)
     {
         next if ($file =~ /^[\.]+/);
         if (-d "$Dir/$file")
-	{
-	    push (@Results, RecurseDir("$Dir/$file"));
-	}
-	else
-	{
-	    push (@Results, "$Dir/$file");
-	}
+        {
+            push (@Results, RecurseDir("$Dir/$file"));
+        }
+        else
+        {
+            push (@Results, "$Dir/$file");
+        }
     }
-    
+
     return @Results;
 }