List thorn names with all parameter files and alphabetically too.

Implements Cactus/901


git-svn-id: http://svn.cactuscode.org/flesh/trunk@2966 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 66 insertions, 46 deletions

diff --git a/lib/sbin/CopyParFiles.pl b/lib/sbin/CopyParFiles.pl
index e3ce8778..5b2b9494 100644
--- a/lib/sbin/CopyParFiles.pl
+++ b/lib/sbin/CopyParFiles.pl
@@ -37,57 +37,77 @@ while (<THORNLIST>)
 }
 close(THORNLIST);
 
+@sorted = sort(@thorns);
+
 for ($i=0;$i<$nthorns;$i++)
 {
- $thorn=$thorns[$i];
- $thorn = "arrangements/$thorn/par";
- if (-d $thorn)
- {    
-   chdir $thorn;
-   while ($parfile = <*.par>)
-   { 
-     $gotall = 1;
-     @ActiveThorns = &GetActiveThorns($parfile);
-     $donothave = "";
-     for ($j=0;$j<scalar(@ActiveThorns);$j++)
-     {
-       $gotit = 0;
-       for ($k=0;$k<$nthorns;$k++)
-       {
-	 $thorns[$k] =~ m:.*/(\w*):;
-	 if ($ActiveThorns[$j] =~ /^$1$/i)
-	 {
-	   $gotit = 1;
-	 }
-       }
-       if ($gotit == 0)
-       {
-	 $donothave .= "$ActiveThorns[$j] ";
-	 $gotall = 0;
-       }
-     }
+  $thorn = $sorted[$i];
+  $thorn = "arrangements/$thorn/par";
+  if (-d $thorn)
+  {    
+    $newthorn = 1;
+    chdir $thorn;
+    while ($parfile = <*.par>)
+    { 
+      $gotall = 1;
+      $counter = 0;
+      @ActiveThorns = &GetActiveThorns($parfile);
+      $donothave = "";
+      for ($j=0;$j<scalar(@ActiveThorns);$j++)
+      {
+	$gotit = 0;
+	for ($k=0;$k<$nthorns;$k++)
+	{
+	  $sorted[$k] =~ m:.*/(\w*):;
+	  if ($ActiveThorns[$j] =~ /^$1$/i)
+	  {
+	    $gotit = 1;
+	  }
+	}
+	if ($gotit == 0)
+	{
+	  $counter++;
+	  if ($counter%6 != 0)
+	  {
+	    $donothave .= "$ActiveThorns[$j] ";
+	  }
+	  else
+	  {
+	    $donothave .= "\n       $ActiveThorns[$j] ";
+	  }
+	  $gotall = 0;
+	}
+      }
 
-     if ($gotall == 1)
-     {
-       if (-e "$home/examples/$config/$parfile")
-       {
-	 print "  $parfile:  Exists, no overwrite\n";
-       }
-       else
-       {
-	 print "  $parfile: Copying from $thorns[$i]\n";
-	 system("cp $parfile $home/examples/$config/$parfile");
-       }
-     }
-     else
-     {
-       print "  $parfile: Missing thorns ($donothave)\n";
+      if ($newthorn == 1)
+      {
+	print "  $sorted[$i]:\n";
+	$newthorn = 0;
+      }
+      
+      if ($gotall == 1)
+      {
+	if (-e "$home/examples/$config/$parfile")
+	{
+	  print "    $parfile: Not copied, already exists\n";
+	}
+	else
+	{
+	  print "    $parfile: Copied\n";
+	  system("cp $parfile $home/examples/$config/$parfile");
+	}
+      }
+      else
+      {
+       $donothave =~ s/\s*$//;
+       print "    $parfile: Not copied, missing thorns\n      ($donothave)\n";
      }
-   }
-   
-   chdir "$home${sep}";
+    }
+    
+    chdir "$home${sep}";
+
+  }
 
- }
 }
 
 # Parse the active thorns from a parameter file